Add service loader support to desugared library KotlinMetadataTest
Kotlin reflect have classes loaded as Java ServiceLoader. That is
the case for all verisons of Kotlin reflect. The concrete test only
failed for Kotlin 1.7 and 1.8, but that seems to be more an internal
Kotlin refelct implementation detail of when the service is created.
Change-Id: Idbef69a6b748b32a7e37b847900ccf66172e5448
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 d6cb58d..52b9842 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
@@ -89,6 +89,11 @@
.applyIf(
compilationSpecification.isProgramShrink(),
builder -> builder.addProgramFiles(kotlinc.getKotlinAnnotationJar()))
+ .addOptionsModification(
+ options -> {
+ options.testing.enableD8ResourcesPassThrough = true;
+ options.dataResourceConsumer = options.programConsumer.getDataResourceConsumer();
+ })
.addKeepMainRule(PKG + ".MainKt")
.addKeepAllClassesRule()
.addKeepAttributes(ProguardKeepAttributes.RUNTIME_VISIBLE_ANNOTATIONS)