Fixes for minimal bazel build and its errorprone checks.
Bug: b/270137541
Change-Id: I6e4461c9c1f310e664fc0770284402eb678607d2
diff --git a/src/main/java/com/android/tools/r8/naming/ProguardMapError.java b/src/main/java/com/android/tools/r8/naming/ProguardMapError.java
index 2569f12..d4e031e 100644
--- a/src/main/java/com/android/tools/r8/naming/ProguardMapError.java
+++ b/src/main/java/com/android/tools/r8/naming/ProguardMapError.java
@@ -3,28 +3,32 @@
// BSD-style license that can be found in the LICENSE file.
package com.android.tools.r8.naming;
-import com.android.tools.r8.naming.MemberNaming.Signature;
import com.android.tools.r8.origin.Origin;
import com.android.tools.r8.position.Position;
+import com.android.tools.r8.utils.DescriptorUtils;
import com.android.tools.r8.utils.StringDiagnostic;
public class ProguardMapError extends StringDiagnostic {
protected static final String DUPLICATE_TARGET_MESSAGE = "'%s' and '%s' map to same name: '%s'";
protected static final String DUPLICATE_SOURCE_MESSAGE = "'%s' already has a mapping";
+ protected static final String DUPLICATE_SOURCE_MEMBER_MESSAGE =
+ "'%s' in '%s' already has a mapping";
private ProguardMapError(String message, Position position) {
super(message, Origin.unknown(), position);
}
- static ProguardMapError duplicateSourceClass(String typeName, Position position) {
+ static ProguardMapError duplicateSourceClass(String classDescriptor, Position position) {
+ String typeName = DescriptorUtils.descriptorToJavaType(classDescriptor);
return new ProguardMapError(String.format(DUPLICATE_SOURCE_MESSAGE, typeName), position);
}
static ProguardMapError duplicateSourceMember(
- String signature, String typeName, Position position) {
+ String signature, String classDescriptor, Position position) {
+ String typeName = DescriptorUtils.descriptorToJavaType(classDescriptor);
return new ProguardMapError(
- String.format(DUPLICATE_SOURCE_MESSAGE, signature, typeName), position);
+ String.format(DUPLICATE_SOURCE_MEMBER_MESSAGE, signature, typeName), position);
}
static ProguardMapError duplicateTargetClass(
@@ -32,11 +36,4 @@
return new ProguardMapError(
String.format(DUPLICATE_TARGET_MESSAGE, source, other, mappedName), position);
}
-
- static ProguardMapError duplicateTargetSignature(
- Signature source, Signature other, String mappedName, Position position) {
- return new ProguardMapError(
- String.format(DUPLICATE_TARGET_MESSAGE, source.toString(), other.toString(), mappedName),
- position);
- }
}
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 e7511bd..bb88cdb 100644
--- a/src/test/java/com/android/tools/r8/naming/SeedMapperTests.java
+++ b/src/test/java/com/android/tools/r8/naming/SeedMapperTests.java
@@ -10,6 +10,8 @@
import com.android.tools.r8.Diagnostic;
import com.android.tools.r8.TestBase;
import com.android.tools.r8.TestDiagnosticMessagesImpl;
+import com.android.tools.r8.TestParameters;
+import com.android.tools.r8.TestParametersCollection;
import com.android.tools.r8.utils.AbortException;
import com.android.tools.r8.utils.FileUtils;
import com.android.tools.r8.utils.Reporter;
@@ -17,9 +19,22 @@
import java.nio.file.Path;
import org.junit.Ignore;
import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+@RunWith(Parameterized.class)
public class SeedMapperTests extends TestBase {
+ @Parameters(name = "{0}")
+ public static TestParametersCollection data() {
+ return getTestParameters().withNoneRuntime().build();
+ }
+
+ public SeedMapperTests(TestParameters parameters) {
+ parameters.assertNoneRuntime();
+ }
+
private Path getApplyMappingFile(String... pgMap) throws IOException {
Path mapPath = temp.newFile().toPath();
FileUtils.writeTextFile(mapPath, pgMap);
@@ -78,7 +93,7 @@
assertEquals(1, testDiagnosticMessages.getErrors().size());
Diagnostic diagnostic = testDiagnosticMessages.getErrors().get(0);
assertEquals(
- String.format(ProguardMapError.DUPLICATE_SOURCE_MESSAGE, "int aaaa(B)"),
+ String.format(ProguardMapError.DUPLICATE_SOURCE_MEMBER_MESSAGE, "int aaaa(B)", "A.B.C"),
diagnostic.getDiagnosticMessage());
assertEquals("line 3", diagnostic.getPosition().getDescription());
}
@@ -101,7 +116,7 @@
assertEquals(1, testDiagnosticMessages.getErrors().size());
Diagnostic diagnostic = testDiagnosticMessages.getErrors().get(0);
assertEquals(
- String.format(ProguardMapError.DUPLICATE_SOURCE_MESSAGE, "int aaaa"),
+ String.format(ProguardMapError.DUPLICATE_SOURCE_MEMBER_MESSAGE, "int aaaa", "A.B.C"),
diagnostic.getDiagnosticMessage());
assertEquals("line 3", diagnostic.getPosition().getDescription());
}
