Fix neverinline hack in lambdaDesugaringNPlus test
Change-Id: I18ec5cfae2b6ddff72b594c2bf2d6a1f1601faa1
diff --git a/src/test/examplesAndroidO/lambdadesugaringnplus/LambdasWithStaticAndDefaultMethods.java b/src/test/examplesAndroidO/lambdadesugaringnplus/LambdasWithStaticAndDefaultMethods.java
index ed42134..52db9bc 100644
--- a/src/test/examplesAndroidO/lambdadesugaringnplus/LambdasWithStaticAndDefaultMethods.java
+++ b/src/test/examplesAndroidO/lambdadesugaringnplus/LambdasWithStaticAndDefaultMethods.java
@@ -327,7 +327,6 @@
@SomeAnnotation(4)
static void annotatedStaticMethod() {
- synchronized (AnnotatedInterface.class) { } // Do not inline
}
}
diff --git a/src/test/java/com/android/tools/r8/R8RunExamplesAndroidOTest.java b/src/test/java/com/android/tools/r8/R8RunExamplesAndroidOTest.java
index 75fe21f..cf32b8a 100644
--- a/src/test/java/com/android/tools/r8/R8RunExamplesAndroidOTest.java
+++ b/src/test/java/com/android/tools/r8/R8RunExamplesAndroidOTest.java
@@ -48,6 +48,7 @@
+ "LambdasWithStaticAndDefaultMethods$B38302860$AnnotatedInterface{",
" *;",
"}",
+ "-neverinline interface **$AnnotatedInterface { static void annotatedStaticMethod(); }",
"-keepattributes *Annotation*",
"-dontobfuscate",
"-allowaccessmodification");
@@ -197,6 +198,7 @@
.withMinApiLevel(ToolHelper.getMinApiLevelForDexVmNoHigherThan(AndroidApiLevel.K))
.withInterfaceMethodDesugaring(OffOrAuto.Auto)
.withOptionConsumer(opts -> opts.enableClassInlining = false)
+ .withBuilderTransformation(ToolHelper::allowTestProguardOptions)
.withBuilderTransformation(
b -> b.addProguardConfiguration(PROGUARD_OPTIONS_N_PLUS, Origin.unknown()))
.withDexCheck(inspector -> checkLambdaCount(inspector, 40, "lambdadesugaringnplus"))
@@ -206,6 +208,7 @@
.withMinApiLevel(ToolHelper.getMinApiLevelForDexVmNoHigherThan(AndroidApiLevel.K))
.withInterfaceMethodDesugaring(OffOrAuto.Auto)
.withOptionConsumer(opts -> opts.enableClassInlining = true)
+ .withBuilderTransformation(ToolHelper::allowTestProguardOptions)
.withBuilderTransformation(
b -> b.addProguardConfiguration(PROGUARD_OPTIONS_N_PLUS, Origin.unknown()))
// TODO(b/120814598): Should be 5. Some lambdas are not class inlined because parameter
@@ -221,6 +224,7 @@
.withMinApiLevel(AndroidApiLevel.N)
.withInterfaceMethodDesugaring(OffOrAuto.Auto)
.withOptionConsumer(opts -> opts.enableClassInlining = false)
+ .withBuilderTransformation(ToolHelper::allowTestProguardOptions)
.withBuilderTransformation(
b -> b.addProguardConfiguration(PROGUARD_OPTIONS_N_PLUS, Origin.unknown()))
.withDexCheck(inspector -> checkLambdaCount(inspector, 40, "lambdadesugaringnplus"))
@@ -230,6 +234,7 @@
.withMinApiLevel(AndroidApiLevel.N)
.withInterfaceMethodDesugaring(OffOrAuto.Auto)
.withOptionConsumer(opts -> opts.enableClassInlining = true)
+ .withBuilderTransformation(ToolHelper::allowTestProguardOptions)
.withBuilderTransformation(
b -> b.addProguardConfiguration(PROGUARD_OPTIONS_N_PLUS, Origin.unknown()))
// TODO(b/120814598): Should be 5. Some lambdas are not class inlined because parameter
