1 files changed, 8 insertions, 2 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/ApplicationManifest.java b/src/main/java/com/google/devtools/build/lib/rules/android/ApplicationManifest.java
index a9d096ee2a..1ef2406f50 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/ApplicationManifest.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/ApplicationManifest.java
@@ -603,7 +603,10 @@ public final class ApplicationManifest {
               .setMergedResourcesOut(mergedResources)
               .setManifestOut(manifestOut)
               .setClassJarOut(rJavaClassJar)
-              .setDataBindingInfoZip(dataBindingInfoZip);
+              .setDataBindingInfoZip(dataBindingInfoZip)
+              .setThrowOnResourceConflict(
+                  ruleContext.getConfiguration()
+                      .getFragment(AndroidConfiguration.class).throwOnResourceConflict());
       ResourceContainer merged = resourcesMergerBuilder.build(ruleContext);
 
       processed =
@@ -642,7 +645,10 @@ public final class ApplicationManifest {
               .setVersionCode(manifestValues.get("versionCode"))
               .setVersionName(manifestValues.get("versionName"))
               .setFeatureOf(featureOf)
-              .setFeatureAfter(featureAfter);
+              .setFeatureAfter(featureAfter)
+              .setThrowOnResourceConflict(
+                ruleContext.getConfiguration()
+                    .getFragment(AndroidConfiguration.class).throwOnResourceConflict());
       if (!incremental) {
         builder
             .targetAaptVersion(AndroidAaptVersion.AAPT)