Disable check for duplicate mappings in mapping file
Bug: b/293630963
Change-Id: Ib6729f22873e25c97526276a2a947c5c190b5f42
diff --git a/src/main/java/com/android/tools/r8/naming/ClassNamingForMapApplier.java b/src/main/java/com/android/tools/r8/naming/ClassNamingForMapApplier.java
index ac54eba..5957cef 100644
--- a/src/main/java/com/android/tools/r8/naming/ClassNamingForMapApplier.java
+++ b/src/main/java/com/android/tools/r8/naming/ClassNamingForMapApplier.java
@@ -65,6 +65,12 @@
if (signature.isQualified()) {
qualifiedMethodMembers.computeIfAbsent(signature, k -> new ArrayList<>(2)).add(entry);
} else if (methodMembers.put(signature, entry) != null) {
+ // TODO(b/293630963): We are simply not able to handle positions correctly for outlines
+ // at this point. Remove when we do not call GraphLens.getOriginalMethodSignature when
+ // constructing positions.
+ if (true) {
+ return this;
+ }
reporter.error(
ProguardMapError.duplicateSourceMember(
signature.toString(), this.originalName, entry.getPosition()));
diff --git a/src/test/java/com/android/tools/r8/naming/SeedMapperTests.java b/src/test/java/com/android/tools/r8/naming/SeedMapperTests.java
index bb88cdb..31e8267 100644
--- a/src/test/java/com/android/tools/r8/naming/SeedMapperTests.java
+++ b/src/test/java/com/android/tools/r8/naming/SeedMapperTests.java
@@ -88,7 +88,10 @@
Reporter reporter = new Reporter(testDiagnosticMessages);
try {
SeedMapper.seedMapperFromFile(reporter, applyMappingFile);
- fail("Should have thrown an error");
+ // TODO(b/293630963): Re-enable check.
+ if (false) {
+ fail("Should have thrown an error");
+ }
} catch (RuntimeException e) {
assertEquals(1, testDiagnosticMessages.getErrors().size());
Diagnostic diagnostic = testDiagnosticMessages.getErrors().get(0);
