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, 2 insertions, 2 deletions

diff --git a/src/tools/android/java/com/google/devtools/build/android/AndroidResourceMerger.java b/src/tools/android/java/com/google/devtools/build/android/AndroidResourceMerger.java
index a5126c6c28..2b63b5647b 100644
--- a/src/tools/android/java/com/google/devtools/build/android/AndroidResourceMerger.java
+++ b/src/tools/android/java/com/google/devtools/build/android/AndroidResourceMerger.java
@@ -31,10 +31,10 @@ import java.util.logging.Logger;
 // TODO(bazel-team): Turn into an instance object, in order to use an external ExecutorService.
 public class AndroidResourceMerger {
   /** Thrown when there is a unexpected condition during merging. */
-  public static class MergingException extends RuntimeException {
+  public static class MergingException extends UserException {
 
     private MergingException(Throwable e) {
-      super(e);
+      super("Error during merging", e);
     }
 
     private MergingException(String message) {