Fix bug where merge conflicts for resources defined in XML with equal…

… values were being falsely logged during build as warnings

RELNOTES: none
PiperOrigin-RevId: 161723206

src/test/java/com/google/devtools/build/android/AndroidDataMergerTest.java

@@ -339,6 +339,39 @@ public boolean checkEquality(DataSource one, DataSource two) throws IOException
                     .build()));
   }
 
+  @Test
+  public void mergeDirectConflictDuplicatedWithDifferentSources() throws Exception {
+    Path primaryRoot = fileSystem.getPath("primary");
+    Path directRoot = fileSystem.getPath("direct");
+
+    ParsedAndroidData transitiveDependency = ParsedAndroidDataBuilder.empty();
+
+    ParsedAndroidData directDependency =
+        ParsedAndroidDataBuilder.buildOn(directRoot, fqnFactory)
+            // Two string/exit will create conflict.
+            .overwritable(
+                xml("string/exit")
+                    .source("values/strings.xml")
+                    .value(SimpleXmlResourceValue.createWithValue(Type.STRING, "way out")),
+                xml("string/exit")
+                    .source("values/more_strings.xml")
+                    .value(SimpleXmlResourceValue.createWithValue(Type.STRING, "way out")),
+                xml("string/another_key")
+                    .source("values/more_strings.xml")
+                    .value(SimpleXmlResourceValue.createWithValue(Type.STRING, "another way out")))
+            .build();
+
+    UnvalidatedAndroidData primary =
+        AndroidDataBuilder.of(primaryRoot)
+            .createManifest("AndroidManifest.xml", "com.google.mergetest")
+            .buildUnvalidated();
+
+    AndroidDataMerger merger = AndroidDataMerger.createWithDefaults();
+    merger.merge(transitiveDependency, directDependency, primary, false);
+
+    assertThat(loggingHandler.warnings).isEmpty();
+  }
+
   @Test
   public void mergeDirectConflictWithPrimaryOverride() throws Exception {
     Path primaryRoot = fileSystem.getPath("primary");

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

@@ -369,4 +369,13 @@ public DataValue update(DataSource source) {
   public String asConflictString() {
     return source.asConflictString();
   }
+
+  @Override
+  public boolean valueEquals(DataValue value) {
+    if (!(value instanceof DataResourceXml)) {
+      return false;
+    }
+    DataResourceXml other = (DataResourceXml) value;
+    return Objects.equals(xml, other.xml);
+  }
 }

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

@@ -38,4 +38,10 @@ int serializeTo(
 
   /** Provides a representation of the value suitable for a conflict message. */
   String asConflictString();
+
+  /**
+   * Ignores metadata in the DataValue object and returns true if the value properties are
+   * equivalent to another given DataValue object
+   */
+  boolean valueEquals(DataValue value);
 }

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

@@ -129,4 +129,9 @@ public DataValue update(DataSource source) {
   public String asConflictString() {
     return source.asConflictString();
   }
+
+  @Override
+  public boolean valueEquals(DataValue value) {
+    return equals(value);
+  }
 }

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

@@ -86,7 +86,7 @@ DataValue overwritten() {
   }
 
   boolean isValidWith(SourceChecker checker) throws IOException {
-    return !primary.equals(overwritten)
+    return !primary.valueEquals(overwritten)
         && !checker.checkEquality(primary.source(), overwritten.source());
   }