Lookup minified name through mapping file for shrunken lib
Change-Id: Ieac03b72181695a892038ff879e7be0300b93178
diff --git a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/DesugaredLibraryTestBase.java b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/DesugaredLibraryTestBase.java
index 8379927..5b87397 100644
--- a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/DesugaredLibraryTestBase.java
+++ b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/DesugaredLibraryTestBase.java
@@ -128,9 +128,13 @@
StringResource.fromFile(ToolHelper.DESUGAR_LIB_JSON_FOR_TESTING))
.setMinApiLevel(apiLevel.getLevel())
.setOutput(desugaredLib, OutputMode.DexIndexed);
+ Path mapping = null;
if (shrink) {
- l8Builder.addProguardConfiguration(
- Arrays.asList(keepRules.split(System.lineSeparator())), Origin.unknown());
+ mapping = temp.newFolder().toPath().resolve("mapping.txt");
+ List<String> lines =
+ new ArrayList<>(Arrays.asList(keepRules.split(System.lineSeparator())));
+ lines.add("-printmapping " + mapping);
+ l8Builder.addProguardConfiguration(lines, Origin.unknown());
}
ToolHelper.runL8(
l8Builder.build(),
@@ -151,13 +155,13 @@
"Invalid parameter counts in MethodParameter attributes.")));
}
// TODO(b/176900254): The nest check should not be necessary.
- new CodeInspector(desugaredLib)
+ new CodeInspector(desugaredLib, mapping)
.forAllClasses(
clazz ->
assertTrue(
clazz.getFinalName().startsWith("j$.")
|| clazz
- .getFinalName()
+ .getOriginalName()
.startsWith(NestBasedAccessDesugaring.NEST_CONSTRUCTOR_NAME)));
return desugaredLib;
} catch (Exception e) {
