Add annotation.jar to classpath for kotlin tests
Bug: 176133676
Change-Id: I758069c11707da584d3f65dc1a44fdf973b3be7c
diff --git a/src/test/java/com/android/tools/r8/TestShrinkerBuilder.java b/src/test/java/com/android/tools/r8/TestShrinkerBuilder.java
index 8f1262e..c6c302f 100644
--- a/src/test/java/com/android/tools/r8/TestShrinkerBuilder.java
+++ b/src/test/java/com/android/tools/r8/TestShrinkerBuilder.java
@@ -146,12 +146,6 @@
return addDontWarn("java.nio.file.**");
}
- // TODO(b/176133676): Investigate why there are missing class references to org.jetbrains
- @Deprecated
- public T addDontWarnJetBrains() {
- return addDontWarn("org.jetbrains.**");
- }
-
public T addDontWarnJetBrainsAnnotations() {
return addDontWarnJetBrainsNotNullAnnotation().addDontWarnJetBrainsNullableAnnotation();
}
diff --git a/src/test/java/com/android/tools/r8/ToolHelper.java b/src/test/java/com/android/tools/r8/ToolHelper.java
index 2ef51ed..c906281 100644
--- a/src/test/java/com/android/tools/r8/ToolHelper.java
+++ b/src/test/java/com/android/tools/r8/ToolHelper.java
@@ -860,6 +860,12 @@
return reflectJar;
}
+ public static Path getKotlinAnnotationJar(KotlinCompiler kotlinc) {
+ Path annotationJar = kotlinc.getFolder().resolve("annotations-13.0.jar");
+ assert Files.exists(annotationJar) : "Expected annotation jar";
+ return annotationJar;
+ }
+
public static Path getJdwpTestsCfJarPath(AndroidApiLevel minSdk) {
if (minSdk.getLevel() >= AndroidApiLevel.N.getLevel()) {
return Paths.get("third_party", "jdwp-tests", "apache-harmony-jdwp-tests-host.jar");
@@ -889,8 +895,8 @@
super(parentFolder);
}
- protected void after() {
- } // instead of remove, do nothing
+ @Override
+ protected void after() {} // instead of remove, do nothing
}
// For non-Linux platforms create the temporary directory in the repository root to simplify
diff --git a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/kotlin/KotlinMetadataTest.java b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/kotlin/KotlinMetadataTest.java
index 55d4763..4ac6ddf 100644
--- a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/kotlin/KotlinMetadataTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/kotlin/KotlinMetadataTest.java
@@ -124,12 +124,12 @@
.addProgramFiles(compiledJars.getForConfiguration(kotlinParameters))
.addProgramFiles(ToolHelper.getKotlinStdlibJar(kotlinParameters.getCompiler()))
.addProgramFiles(ToolHelper.getKotlinReflectJar(kotlinParameters.getCompiler()))
+ .addProgramFiles(ToolHelper.getKotlinAnnotationJar(kotlinParameters.getCompiler()))
.addKeepMainRule(PKG + ".MainKt")
.addKeepAllClassesRule()
.addKeepAttributes(ProguardKeepAttributes.RUNTIME_VISIBLE_ANNOTATIONS)
.setMinApi(parameters.getApiLevel())
- .allowDiagnosticWarningMessages()
- .addDontWarnJetBrains();
+ .allowDiagnosticWarningMessages();
KeepRuleConsumer keepRuleConsumer = null;
if (desugarLibrary) {
keepRuleConsumer = createKeepRuleConsumer(parameters);
diff --git a/src/test/java/com/android/tools/r8/kotlin/ProcessKotlinReflectionLibTest.java b/src/test/java/com/android/tools/r8/kotlin/ProcessKotlinReflectionLibTest.java
index 9f92a95..f53dae8 100644
--- a/src/test/java/com/android/tools/r8/kotlin/ProcessKotlinReflectionLibTest.java
+++ b/src/test/java/com/android/tools/r8/kotlin/ProcessKotlinReflectionLibTest.java
@@ -38,7 +38,9 @@
private void test(ThrowableConsumer<R8FullTestBuilder> consumer) throws Exception {
testForR8(parameters.getBackend())
.addLibraryFiles(
- ToolHelper.getMostRecentAndroidJar(), ToolHelper.getKotlinStdlibJar(kotlinc))
+ ToolHelper.getMostRecentAndroidJar(),
+ ToolHelper.getKotlinStdlibJar(kotlinc),
+ ToolHelper.getKotlinAnnotationJar(kotlinc))
.addProgramFiles(ToolHelper.getKotlinReflectJar(kotlinc))
.addKeepAttributes(ProguardKeepAttributes.SIGNATURE)
.addKeepAttributes(ProguardKeepAttributes.INNER_CLASSES)
@@ -49,14 +51,12 @@
@Test
public void testAsIs() throws Exception {
- test(
- builder ->
- builder.addDontWarnJetBrains().noMinification().noOptimization().noTreeShaking());
+ test(builder -> builder.noMinification().noOptimization().noTreeShaking());
}
@Test
public void testDontShrinkAndDontOptimize() throws Exception {
- test(builder -> builder.addDontWarnJetBrains().noOptimization().noTreeShaking());
+ test(builder -> builder.noOptimization().noTreeShaking());
}
@Test
@@ -65,7 +65,6 @@
builder ->
builder
.addKeepRules("-keep,allowobfuscation class **.*KClasses*")
- .addDontWarnJetBrains()
.noTreeShaking()
.addOptionsModification(
o -> {
@@ -78,12 +77,12 @@
@Test
public void testDontShrinkAndDontObfuscate() throws Exception {
- test(builder -> builder.addDontWarnJetBrains().noMinification().noTreeShaking());
+ test(builder -> builder.noMinification().noTreeShaking());
}
@Test
public void testDontShrink() throws Exception {
- test(builder -> builder.addDontWarnJetBrains().noTreeShaking());
+ test(TestShrinkerBuilder::noTreeShaking);
}
@Test
@@ -92,7 +91,6 @@
builder ->
builder
.addKeepRules("-keep,allowobfuscation class **.*KClasses*")
- .addDontWarnJetBrains()
.noTreeShaking());
}
diff --git a/src/test/java/com/android/tools/r8/kotlin/reflection/KotlinReflectTest.java b/src/test/java/com/android/tools/r8/kotlin/reflection/KotlinReflectTest.java
index ae80118..3732458 100644
--- a/src/test/java/com/android/tools/r8/kotlin/reflection/KotlinReflectTest.java
+++ b/src/test/java/com/android/tools/r8/kotlin/reflection/KotlinReflectTest.java
@@ -86,11 +86,11 @@
.addProgramFiles(compiledJars.getForConfiguration(kotlinc, targetVersion))
.addProgramFiles(ToolHelper.getKotlinStdlibJar(kotlinc))
.addProgramFiles(ToolHelper.getKotlinReflectJar(kotlinc))
+ .addProgramFiles(ToolHelper.getKotlinAnnotationJar(kotlinc))
.setMinApi(parameters.getApiLevel())
.addKeepAllClassesRule()
.addKeepAttributes(ProguardKeepAttributes.RUNTIME_VISIBLE_ANNOTATIONS)
.allowDiagnosticWarningMessages()
- .addDontWarnJetBrains()
.compile()
.writeToZip(foo.toPath())
.assertAllWarningMessagesMatch(equalTo("Resource 'META-INF/MANIFEST.MF' already exists."))
