Fail when resources use invalid java identifiers.

RELNOTES:None
PiperOrigin-RevId: 200766836

1 files changed, 13 insertions, 13 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 f22dec2740..0fe2d35a65 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
@@ -16,6 +16,7 @@ package com.google.devtools.build.android;
 
 import com.google.devtools.build.android.AndroidResourceMerger.MergingException;
 import com.google.devtools.build.android.aapt2.Aapt2Exception;
+import com.google.devtools.build.android.resources.JavaIdentifierValidator.InvalidJavaIdentifier;
 import com.google.devtools.common.options.EnumConverter;
 import com.google.devtools.common.options.Option;
 import com.google.devtools.common.options.OptionDocumentationCategory;
@@ -167,18 +168,17 @@ public class ResourceProcessorBusyBox {
   /** Flag specifications for this action. */
   public static final class Options extends OptionsBase {
     @Option(
-      name = "tool",
-      defaultValue = "null",
-      converter = ToolConverter.class,
-      category = "input",
-      documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
-      effectTags = {OptionEffectTag.UNKNOWN},
-      help =
-          "The processing tool to execute. "
-              + "Valid tools: PACKAGE, VALIDATE, GENERATE_BINARY_R, GENERATE_LIBRARY_R, PARSE, "
-              + "MERGE, GENERATE_AAR, SHRINK, MERGE_MANIFEST, COMPILE_LIBRARY_RESOURCES, "
-              + "LINK_STATIC_LIBRARY, AAPT2_PACKAGE, SHRINK_AAPT2, MERGE_COMPILED."
-    )
+        name = "tool",
+        defaultValue = "null",
+        converter = ToolConverter.class,
+        category = "input",
+        documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
+        effectTags = {OptionEffectTag.UNKNOWN},
+        help =
+            "The processing tool to execute. "
+                + "Valid tools: PACKAGE, VALIDATE, GENERATE_BINARY_R, GENERATE_LIBRARY_R, PARSE, "
+                + "MERGE, GENERATE_AAR, SHRINK, MERGE_MANIFEST, COMPILE_LIBRARY_RESOURCES, "
+                + "LINK_STATIC_LIBRARY, AAPT2_PACKAGE, SHRINK_AAPT2, MERGE_COMPILED.")
     public Tool tool;
   }
 
@@ -191,7 +191,7 @@ public class ResourceProcessorBusyBox {
     Options options = optionsParser.getOptions(Options.class);
     try {
       options.tool.call(optionsParser.getResidue().toArray(new String[0]));
-    } catch (MergingException | IOException | Aapt2Exception e) {
+    } catch (MergingException | IOException | Aapt2Exception | InvalidJavaIdentifier e) {
       logger.severe(e.getMessage());
       logSuppressedAndExit(e);
     }