Create asset merging action

This action is a trimmed-down version of the resource merging action (no
resources or manifests).

Also, create a base class to collect boilerplate action code, and a new
Exception to indicate that we should exit an action immediately (rather than
throw and print the stack trace).

RELNOTES: none
PiperOrigin-RevId: 193054422

1 files changed, 6 insertions, 0 deletions

diff --git a/src/tools/android/java/com/google/devtools/build/android/ResourceProcessorBusyBox.java b/src/tools/android/java/com/google/devtools/build/android/ResourceProcessorBusyBox.java
index 6f120ae165..32a17e7ddd 100644
--- a/src/tools/android/java/com/google/devtools/build/android/ResourceProcessorBusyBox.java
+++ b/src/tools/android/java/com/google/devtools/build/android/ResourceProcessorBusyBox.java
@@ -143,6 +143,12 @@ public class ResourceProcessorBusyBox {
       void call(String[] args) throws Exception {
         Aapt2ResourceShrinkingAction.main(args);
       }
+    },
+    MERGE_ASSETS() {
+      @Override
+      void call(String[] args) throws Exception {
+        AndroidAssetMergingAction.main(args);
+      }
     };
 
     abstract void call(String[] args) throws Exception;