Reattempt to fix lambdaDesugaringNPlus test.
Change-Id: Ibce2e3185364cf47ae095f5bc2c96813eda5cd47
diff --git a/src/test/examplesAndroidO/lambdadesugaringnplus/LambdasWithStaticAndDefaultMethods.java b/src/test/examplesAndroidO/lambdadesugaringnplus/LambdasWithStaticAndDefaultMethods.java
index 52db9bc..e9e7a58 100644
--- a/src/test/examplesAndroidO/lambdadesugaringnplus/LambdasWithStaticAndDefaultMethods.java
+++ b/src/test/examplesAndroidO/lambdadesugaringnplus/LambdasWithStaticAndDefaultMethods.java
@@ -327,6 +327,10 @@
@SomeAnnotation(4)
static void annotatedStaticMethod() {
+ // Bogus body to be included into the root set: if interface desugaring is on, root set
+ // builder will skip marking methods without code.
+ synchronized (AnnotatedInterface.class) {
+ }
}
}
diff --git a/src/test/java/com/android/tools/r8/R8RunExamplesAndroidOTest.java b/src/test/java/com/android/tools/r8/R8RunExamplesAndroidOTest.java
index cf32b8a..0d8e03c 100644
--- a/src/test/java/com/android/tools/r8/R8RunExamplesAndroidOTest.java
+++ b/src/test/java/com/android/tools/r8/R8RunExamplesAndroidOTest.java
@@ -44,10 +44,7 @@
"-keepclasseswithmembers public class * {",
" public static void main(java.lang.String[]);",
"}",
- "-keepclasseswithmembers interface lambdadesugaringnplus."
- + "LambdasWithStaticAndDefaultMethods$B38302860$AnnotatedInterface{",
- " *;",
- "}",
+ "-keepclasseswithmembers interface **$AnnotatedInterface { <methods>; }",
"-neverinline interface **$AnnotatedInterface { static void annotatedStaticMethod(); }",
"-keepattributes *Annotation*",
"-dontobfuscate",
