unknown commit of 5: Fixing the merge warning messages in transitive library overwrites.

Record the sources are overwritten during merging.

--
MOS_MIGRATED_REVID=140654137

1 files changed, 11 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 cbaa642fab..215c895550 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
@@ -13,12 +13,12 @@
 // limitations under the License.
 package com.google.devtools.build.android;
 
-import com.google.common.base.MoreObjects;
-import com.google.common.base.Preconditions;
-
 import com.android.annotations.VisibleForTesting;
 import com.android.annotations.concurrency.Immutable;
-
+import com.google.common.base.MoreObjects;
+import com.google.common.base.Preconditions;
+import com.google.devtools.build.android.AndroidDataMerger.SourceChecker;
+import java.io.IOException;
 import java.util.Objects;
 
 /**
@@ -82,6 +82,13 @@ public class MergeConflict {
     return second;
   }
 
+  boolean isValidWith(SourceChecker checker) throws IOException {
+    return !first.equals(second)
+        && !first.source().hasOveridden(second.source())
+        && !second.source().hasOveridden(first.source())
+        && !checker.checkEquality(first.source(), second.source());
+  }
+
   @Override
   public String toString() {
     return MoreObjects.toStringHelper(this)