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

RELNOTES: none
PiperOrigin-RevId: 161831232

1 files changed, 20 insertions, 12 deletions

diff --git a/src/tools/android/java/com/google/devtools/build/android/AndroidResourceMerger.java b/src/tools/android/java/com/google/devtools/build/android/AndroidResourceMerger.java
index 8fc6075382..eb7fd70711 100644
--- a/src/tools/android/java/com/google/devtools/build/android/AndroidResourceMerger.java
+++ b/src/tools/android/java/com/google/devtools/build/android/AndroidResourceMerger.java
@@ -64,8 +64,8 @@ public class AndroidResourceMerger {
       final VariantType type,
       @Nullable final Path symbolsOut,
       @Nullable AndroidResourceClassWriter rclassWriter,
-      AndroidDataDeserializer deserializer)
-      throws MergingException {
+      AndroidDataDeserializer deserializer,
+      boolean throwOnResourceConflict) {
     Stopwatch timer = Stopwatch.createStarted();
     final ListeningExecutorService executorService =
         MoreExecutors.listeningDecorator(Executors.newFixedThreadPool(15));
@@ -78,7 +78,8 @@ public class AndroidResourceMerger {
               primary,
               primaryManifest,
               type != VariantType.LIBRARY,
-              deserializer);
+              deserializer,
+              throwOnResourceConflict);
       timer.reset().start();
       if (symbolsOut != null) {
         AndroidDataSerializer serializer = AndroidDataSerializer.create();
@@ -114,14 +115,19 @@ public class AndroidResourceMerger {
       ParsedAndroidData primary,
       Path primaryManifest,
       boolean allowPrimaryOverrideAll,
-      AndroidDataDeserializer deserializer)
-      throws MergingException {
+      AndroidDataDeserializer deserializer,
+      boolean throwOnResourceConflict) {
     Stopwatch timer = Stopwatch.createStarted();
     try {
       AndroidDataMerger merger =
           AndroidDataMerger.createWithPathDeduplictor(executorService, deserializer);
       return merger.loadAndMerge(
-          transitive, direct, primary, primaryManifest, allowPrimaryOverrideAll);
+          transitive,
+          direct,
+          primary,
+          primaryManifest,
+          allowPrimaryOverrideAll,
+          throwOnResourceConflict);
     } finally {
       logger.fine(String.format("merge finished in %sms", timer.elapsed(TimeUnit.MILLISECONDS)));
     }
@@ -140,8 +146,8 @@ public class AndroidResourceMerger {
       @Nullable final PngCruncher cruncher,
       final VariantType type,
       @Nullable final Path symbolsOut,
-      final List<String> filteredResources)
-      throws MergingException {
+      final List<String> filteredResources,
+      boolean throwOnResourceConflict) {
     try {
       final ParsedAndroidData parsedPrimary = ParsedAndroidData.from(primary);
       return mergeData(
@@ -155,7 +161,8 @@ public class AndroidResourceMerger {
           type,
           symbolsOut,
           null /* rclassWriter */,
-          AndroidDataDeserializer.withFilteredResources(filteredResources));
+          AndroidDataDeserializer.withFilteredResources(filteredResources),
+          throwOnResourceConflict);
     } catch (IOException e) {
       throw MergingException.wrapException(e);
     }
@@ -175,8 +182,8 @@ public class AndroidResourceMerger {
       @Nullable final PngCruncher cruncher,
       final VariantType type,
       @Nullable final Path symbolsOut,
-      @Nullable final AndroidResourceClassWriter rclassWriter)
-      throws MergingException {
+      @Nullable final AndroidResourceClassWriter rclassWriter,
+      boolean throwOnResourceConflict) {
     final ParsedAndroidData.Builder primaryBuilder = ParsedAndroidData.Builder.newBuilder();
     final AndroidDataDeserializer deserializer = AndroidDataDeserializer.create();
     primary.deserialize(deserializer, primaryBuilder.consumers());
@@ -192,7 +199,8 @@ public class AndroidResourceMerger {
         type,
         symbolsOut,
         rclassWriter,
-        deserializer);
+        deserializer,
+        throwOnResourceConflict);
   }
 }