Disable resource conflict warnings

Author: Bencodes

src/tools/java/com/google/devtools/build/android/Aapt2ResourcePackagingAction.java

@@ -251,6 +251,13 @@ public static final class Options {
         splitter = ColonSplitter.class,
         description = "List of reource only APK files to link against.")
     public List<Path> resourceApks = ImmutableList.of();
+
+    @Parameter(
+        names = "--logWarningOnResourceConflict",
+        arity = 1,
+        description =
+            "If passed, resource merge conflicts will be treated as errors instead of warnings")
+    public boolean logWarningOnResourceConflict;
   }
 
   public static void main(String[] args) throws Exception {
@@ -340,6 +347,7 @@ public static void main(String[] args) throws Exception {
               symbols,
               dataDeserializer,
               options.throwOnResourceConflict,
+              options.logWarningOnResourceConflict,
               executorService);
       if (options.symbolsOut != null) {
         Files.copy(symbolsBin, options.symbolsOut);

src/tools/java/com/google/devtools/build/android/AarGeneratorAction.java

@@ -121,6 +121,13 @@ public static final class AarGeneratorOptions {
         description =
             "If passed, resource merge conflicts will be treated as errors instead of warnings")
     public boolean throwOnResourceConflict;
+
+    @Parameter(
+        names = "--logWarningOnResourceConflict",
+        arity = 1,
+        description =
+            "If passed, resource merge conflicts will be treated as errors instead of warnings")
+    public boolean logWarningOnResourceConflict;
   }
 
   public static void main(String[] args) throws ParameterException, IOException {
@@ -155,7 +162,8 @@ public static void main(String[] args) throws ParameterException, IOException {
               VariantTypeImpl.LIBRARY,
               null,
               /* filteredResources= */ ImmutableList.<String>of(),
-              options.throwOnResourceConflict);
+              options.throwOnResourceConflict,
+              options.logWarningOnResourceConflict);
       logger.fine(String.format("Merging finished at %dms", timer.elapsed(TimeUnit.MILLISECONDS)));
 
       writeAar(

src/tools/java/com/google/devtools/build/android/AndroidAssetMergingAction.java

@@ -98,6 +98,13 @@ public static final class Options {
         description =
             "If passed, asset merge conflicts will be treated as errors instead of warnings")
     public boolean throwOnAssetConflict = true;
+
+    @Parameter(
+        names = "--logWarningOnResourceConflict",
+        arity = 1,
+        description =
+            "If passed, asset merge conflicts will be treated as errors instead of warnings")
+    public boolean logWarningOnResourceConflict;
   }
 
   @Override
@@ -124,6 +131,7 @@ void run(Path tmp, ExecutorServiceCloser executorService) throws Exception {
             /* allowPrimaryOverrideAll = */ false,
             deserializer,
             options.throwOnAssetConflict,
+            options.logWarningOnResourceConflict,
             ContentComparingChecker.create());
 
     logCompletion("Merging");

src/tools/java/com/google/devtools/build/android/AndroidCompiledResourceMergingAction.java

@@ -139,6 +139,13 @@ public static class Options {
         description =
             "Path to where an R.txt file declaring potentially-used resources should be written.")
     public Path rTxtOut;
+
+    @Parameter(
+        names = "--logWarningOnResourceConflict",
+        arity = 1,
+        description =
+            "If passed, resource merge conflicts will be treated as errors instead of warnings")
+    public boolean logWarningOnResourceConflict;
   }
 
   public static void main(String[] args) throws Exception {
@@ -197,6 +204,7 @@ public static void main(String[] args) throws Exception {
           resourceClassWriter,
           rTxtWriter,
           options.throwOnResourceConflict,
+          options.logWarningOnResourceConflict,
           executorService);
       logger.fine(String.format("Merging finished at %sms", timer.elapsed(TimeUnit.MILLISECONDS)));
 

src/tools/java/com/google/devtools/build/android/AndroidDataMerger.java

@@ -155,7 +155,8 @@ UnwrittenMergedAndroidData loadAndMerge(
       ParsedAndroidData primary,
       Path primaryManifest,
       boolean allowPrimaryOverrideAll,
-      boolean throwOnResourceConflict) {
+      boolean throwOnResourceConflict,
+      boolean logWarningOnResourceConflict) {
     Stopwatch timer = Stopwatch.createStarted();
     try {
       logger.fine(
@@ -169,7 +170,8 @@ UnwrittenMergedAndroidData loadAndMerge(
           primary,
           primaryManifest,
           allowPrimaryOverrideAll,
-          throwOnResourceConflict);
+          throwOnResourceConflict,
+          logWarningOnResourceConflict);
     } finally {
       logger.fine(String.format("Resources merged in %sms", timer.elapsed(TimeUnit.MILLISECONDS)));
     }
@@ -245,7 +247,8 @@ UnwrittenMergedAndroidData merge(
       ParsedAndroidData direct,
       UnvalidatedAndroidData primaryData,
       boolean allowPrimaryOverrideAll,
-      boolean throwOnResourceConflict) {
+      boolean throwOnResourceConflict,
+      boolean logWarningOnResourceConflict) {
     try {
       // Extract the primary resources.
       ParsedAndroidData parsedPrimary = ParsedAndroidData.from(primaryData);
@@ -255,7 +258,8 @@ UnwrittenMergedAndroidData merge(
           parsedPrimary,
           primaryData.getManifest(),
           allowPrimaryOverrideAll,
-          throwOnResourceConflict);
+          throwOnResourceConflict,
+          logWarningOnResourceConflict);
     } catch (IOException e) {
       throw MergingException.wrapException(e);
     }
@@ -267,7 +271,8 @@ UnwrittenMergedAndroidData doMerge(
       ParsedAndroidData parsedPrimary,
       Path primaryManifest,
       boolean allowPrimaryOverrideAll,
-      boolean throwOnResourceConflict) {
+      boolean throwOnResourceConflict,
+      boolean logWarningOnResourceConflict) {
 
     // Create the builders for the final parsed data.
     final ParsedAndroidData.Builder primaryBuilder = ParsedAndroidData.Builder.newBuilder();
@@ -392,7 +397,9 @@ UnwrittenMergedAndroidData doMerge(
         if (throwOnResourceConflict) {
           throw MergeConflictException.withMessage(Joiner.on("\n").join(messages));
         } else {
-          logger.warning(Joiner.on("\n").join(messages));
+          if (logWarningOnResourceConflict) {
+            logger.warning(Joiner.on("\n").join(messages));
+          }
         }
       }
     } catch (IOException e) {

src/tools/java/com/google/devtools/build/android/AndroidResourceMerger.java

@@ -41,6 +41,7 @@ static Path mergeDataToSymbols(
       Path symbolsOut,
       AndroidCompiledDataDeserializer deserializer,
       boolean throwOnResourceConflict,
+      boolean logWarningOnResourceConflict,
       ExecutorServiceCloser executorService)
       throws IOException {
     AndroidDataMerger merger =
@@ -53,7 +54,8 @@ static Path mergeDataToSymbols(
             primary,
             manifest,
             packageType.equals(VariantTypeImpl.BASE_APK),
-            throwOnResourceConflict);
+            throwOnResourceConflict,
+            logWarningOnResourceConflict);
     AndroidDataSerializer serializer = AndroidDataSerializer.create();
     merged.serializeTo(serializer);
     serializer.flushTo(symbolsOut);
@@ -96,7 +98,8 @@ public static MergedAndroidData mergeDataAndWrite(
       final VariantTypeImpl type,
       @Nullable final Path symbolsOut,
       final List<String> filteredResources,
-      boolean throwOnResourceConflict) {
+      boolean throwOnResourceConflict,
+      boolean logWarningOnResourceConflict) {
     try (ExecutorServiceCloser executorService = ExecutorServiceCloser.createWithFixedPoolOf(15)) {
       final ParsedAndroidData parsedPrimary = ParsedAndroidData.from(primary);
       return writeMergedData(
@@ -114,6 +117,7 @@ public static MergedAndroidData mergeDataAndWrite(
               type != VariantTypeImpl.LIBRARY,
               AndroidParsedDataDeserializer.withFilteredResources(filteredResources),
               throwOnResourceConflict,
+              logWarningOnResourceConflict,
               ContentComparingChecker.create()));
     } catch (IOException e) {
       throw MergingException.wrapException(e);
@@ -167,6 +171,7 @@ static UnwrittenMergedAndroidData mergeData(
       boolean allowPrimaryOverrideAll,
       AndroidDataDeserializer deserializer,
       boolean throwOnResourceConflict,
+      boolean logWarningOnResourceConflict,
       SourceChecker checker) {
     Stopwatch timer = Stopwatch.createStarted();
     // TODO(b/74333698): Always check the contents of conflicting resources
@@ -179,7 +184,8 @@ static UnwrittenMergedAndroidData mergeData(
           primary,
           primaryManifest,
           allowPrimaryOverrideAll,
-          throwOnResourceConflict);
+          throwOnResourceConflict,
+          logWarningOnResourceConflict);
     } finally {
       logger.fine(String.format("merge finished in %sms", timer.elapsed(TimeUnit.MILLISECONDS)));
     }
@@ -197,6 +203,7 @@ static void mergeCompiledData(
       @Nullable final AndroidResourceClassWriter rclassWriter,
       @Nullable PlaceholderRTxtWriter rTxtWriter,
       boolean throwOnResourceConflict,
+      boolean logWarningOnResourceConflict,
       ListeningExecutorService executorService) {
     final ParsedAndroidData.Builder primaryBuilder = ParsedAndroidData.Builder.newBuilder();
     final AndroidDataDeserializer deserializer =
@@ -216,6 +223,7 @@ static void mergeCompiledData(
               false,
               deserializer,
               throwOnResourceConflict,
+              logWarningOnResourceConflict,
               AndroidDataMerger.NoopSourceChecker.create());
       timer.reset().start();
       merged.writeResourceClass(rclassWriter);