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

RELNOTES: none
PiperOrigin-RevId: 161831232

1 files changed, 10 insertions, 0 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AarGeneratorBuilder.java b/src/main/java/com/google/devtools/build/lib/rules/android/AarGeneratorBuilder.java
index b0ffa9e5b5..c311d82f0f 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AarGeneratorBuilder.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AarGeneratorBuilder.java
@@ -40,6 +40,7 @@ public class AarGeneratorBuilder {
   private Artifact classes;
 
   private Artifact aarOut;
+  private boolean throwOnResourceConflict;
 
   private final RuleContext ruleContext;
   private final SpawnAction.Builder builder;
@@ -79,6 +80,11 @@ public class AarGeneratorBuilder {
     return this;
   }
 
+  public AarGeneratorBuilder setThrowOnResourceConflict(boolean throwOnResourceConflict) {
+    this.throwOnResourceConflict = throwOnResourceConflict;
+    return this;
+  }
+
   public void build(ActionConstructionContext context) {
     List<Artifact> outs = new ArrayList<>();
     List<Artifact> ins = new ArrayList<>();
@@ -115,6 +121,10 @@ public class AarGeneratorBuilder {
     args.add(aarOut.getExecPathString());
     outs.add(aarOut);
 
+    if (throwOnResourceConflict) {
+      args.add("--throwOnResourceConflict");
+    }
+
     ruleContext.registerAction(
         this.builder
             .addInputs(ImmutableList.<Artifact>copyOf(ins))