diff options
| -rw-r--r-- | src/tools/android/java/com/google/devtools/build/android/MergeConflict.java | 6 | ||||
| -rw-r--r-- | src/tools/android/java/com/google/devtools/build/android/ParsedAndroidData.java | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/tools/android/java/com/google/devtools/build/android/MergeConflict.java b/src/tools/android/java/com/google/devtools/build/android/MergeConflict.java index a45993b497..727df64573 100644 --- a/src/tools/android/java/com/google/devtools/build/android/MergeConflict.java +++ b/src/tools/android/java/com/google/devtools/build/android/MergeConflict.java @@ -99,11 +99,13 @@ public class MergeConflict { return false; } MergeConflict that = (MergeConflict) other; - return Objects.equals(first, that.first) && Objects.equals(second, that.second); + return Objects.equals(dataKey, that.dataKey) + && Objects.equals(first, that.first) + && Objects.equals(second, that.second); } @Override public int hashCode() { - return Objects.hash(first, second); + return Objects.hash(dataKey, first, second); } } diff --git a/src/tools/android/java/com/google/devtools/build/android/ParsedAndroidData.java b/src/tools/android/java/com/google/devtools/build/android/ParsedAndroidData.java index a055d188ae..47d3d30af5 100644 --- a/src/tools/android/java/com/google/devtools/build/android/ParsedAndroidData.java +++ b/src/tools/android/java/com/google/devtools/build/android/ParsedAndroidData.java @@ -185,9 +185,9 @@ public class ParsedAndroidData { public void consume(K key, V value) { if (target.containsKey(key)) { conflicts.add(MergeConflict.between(key, value, target.get(key))); - } else { - target.put(key, value); } + // Always record the value, conflict or not, to maintain backwards compatibility. + target.put(key, value); } } |