1 files changed, 15 insertions, 0 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java
index 4820e03710..03878f5bfe 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java
@@ -648,6 +648,15 @@ public class AndroidConfiguration extends BuildConfiguration.Fragment {
     )
     public boolean generateRobolectricRClass;
 
+    @Option(
+        name = "experimental_android_throw_on_resource_conflict",
+        defaultValue = "false",
+        documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
+        effectTags = {OptionEffectTag.UNKNOWN},
+        help = "If passed, resource merge conflicts will be treated as errors instead of warnings"
+    )
+    public boolean throwOnResourceConflict;
+
     @Override
     public FragmentOptions getHost(boolean fallback) {
       Options host = (Options) super.getHost(fallback);
@@ -725,6 +734,7 @@ public class AndroidConfiguration extends BuildConfiguration.Fragment {
   private final boolean exportsManifestDefault;
   private final AndroidAaptVersion androidAaptVersion;
   private final boolean generateRobolectricRClass;
+  private final boolean throwOnResourceConflict;
   private final boolean useParallelDex2Oat;
 
   AndroidConfiguration(Options options) throws InvalidConfigurationException {
@@ -760,6 +770,7 @@ public class AndroidConfiguration extends BuildConfiguration.Fragment {
     this.exportsManifestDefault = options.exportsManifestDefault;
     this.androidAaptVersion = options.androidAaptVersion;
     this.generateRobolectricRClass = options.generateRobolectricRClass;
+    this.throwOnResourceConflict = options.throwOnResourceConflict;
     this.useParallelDex2Oat = options.useParallelDex2Oat;
 
     if (!dexoptsSupportedInIncrementalDexing.contains("--no-locals")) {
@@ -889,6 +900,10 @@ public class AndroidConfiguration extends BuildConfiguration.Fragment {
     return generateRobolectricRClass;
   }
 
+  boolean throwOnResourceConflict() {
+    return throwOnResourceConflict;
+  }
+
   @Override
   public void addGlobalMakeVariables(ImmutableMap.Builder<String, String> globalMakeEnvBuilder) {
     globalMakeEnvBuilder.put("ANDROID_CPU", cpu);