Don't check contents of conflicting compiled resources

Until we properly support checking the contents of these files, don't try to do
so.

RELNOTES: none
PiperOrigin-RevId: 188192286

1 files changed, 21 insertions, 2 deletions

diff --git a/src/tools/android/java/com/google/devtools/build/android/AndroidDataMerger.java b/src/tools/android/java/com/google/devtools/build/android/AndroidDataMerger.java
index 962de7eae3..20a63bf120 100644
--- a/src/tools/android/java/com/google/devtools/build/android/AndroidDataMerger.java
+++ b/src/tools/android/java/com/google/devtools/build/android/AndroidDataMerger.java
@@ -53,6 +53,23 @@ class AndroidDataMerger {
     boolean checkEquality(DataSource one, DataSource two) throws IOException;
   }
 
+  /**
+   * Compares two paths for equality. Does not check the contents of the files.
+   *
+   * <p>TODO(b/74333698): Always check the contents of conflicting resources
+   */
+  static class PathComparingChecker implements SourceChecker {
+
+    static SourceChecker create() {
+      return new PathComparingChecker();
+    }
+
+    @Override
+    public boolean checkEquality(DataSource one, DataSource two) throws IOException {
+      return one.getPath().equals(two.getPath());
+    }
+  }
+
   /** Compares two paths by the contents of the files. */
   static class ContentComparingChecker implements SourceChecker {
 
@@ -125,8 +142,10 @@ class AndroidDataMerger {
 
   /** Creates a merger with a file contents hashing deduplicator. */
   static AndroidDataMerger createWithPathDeduplictor(
-      ListeningExecutorService executorService, AndroidDataDeserializer deserializer) {
-    return new AndroidDataMerger(ContentComparingChecker.create(), executorService, deserializer);
+      ListeningExecutorService executorService,
+      AndroidDataDeserializer deserializer,
+      SourceChecker checker) {
+    return new AndroidDataMerger(checker, executorService, deserializer);
   }
 
   private AndroidDataMerger(