Add flag to turn Android resource merge conflicts from warnings into errors

RELNOTES: none
PiperOrigin-RevId: 161831232

1 files changed, 11 insertions, 0 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidResourceMergingActionBuilder.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidResourceMergingActionBuilder.java
index e86cae2441..5b63f24af6 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidResourceMergingActionBuilder.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidResourceMergingActionBuilder.java
@@ -65,6 +65,7 @@ public class AndroidResourceMergingActionBuilder {
 
   // Flags
   private String customJavaPackage;
+  private boolean throwOnResourceConflict;
 
   /** @param ruleContext The RuleContext that was used to create the SpawnAction.Builder. */
   public AndroidResourceMergingActionBuilder(RuleContext ruleContext) {
@@ -116,6 +117,12 @@ public class AndroidResourceMergingActionBuilder {
     return this;
   }
 
+  public AndroidResourceMergingActionBuilder setThrowOnResourceConflict(
+      boolean throwOnResourceConflict) {
+    this.throwOnResourceConflict = throwOnResourceConflict;
+    return this;
+  }
+
   public ResourceContainer build(ActionConstructionContext context) {
     CustomCommandLine.Builder builder = new CustomCommandLine.Builder();
 
@@ -170,6 +177,10 @@ public class AndroidResourceMergingActionBuilder {
       outs.add(dataBindingInfoZip);
     }
 
+    if (throwOnResourceConflict) {
+      builder.add("--throwOnResourceConflict");
+    }
+
     SpawnAction.Builder spawnActionBuilder = new SpawnAction.Builder();
     // Create the spawn action.
     ruleContext.registerAction(