commit db5cf8a1b51c7bb7f79ed9f45cafde52a16b1f7c
author Christoffer Adamsen <christofferqa@google.com> Wed May 29 10:56:28 2024 +0200
committer Christoffer Adamsen <christofferqa@google.com> Wed May 29 08:58:30 2024 +0000
tree d6c4356a88a8ae65434f49bf218eee45023376d5
parent 853c4fd6bb82e3d08272d88b14e58807c085d7bf

Adjust keep rule for MetadataRewriteInSealedClassTest on kotlin old

Change-Id: Ide208c46d3f873cf965057f2bbba995ecc91d699

src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewriteInSealedClassTest.java

diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewriteInSealedClassTest.java b/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewriteInSealedClassTest.java
index ac00880..24f257b 100644
--- a/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewriteInSealedClassTest.java
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewriteInSealedClassTest.java
@@ -145,7 +145,12 @@
             .addClasspathFiles(kotlinc.getKotlinStdlibJar(), kotlinc.getKotlinAnnotationJar())
             .addProgramFiles(sealedLibJarMap.getForConfiguration(kotlinParameters))
             // Keep the Expr class
-            .addKeepRules("-keep class **.Expr")
+            .applyIf(
+                kotlinc
+                    .getCompilerVersion()
+                    .isLessThanOrEqualTo(KotlinCompilerVersion.KOTLINC_1_4_20),
+                b -> b.addKeepClassAndDefaultConstructor("**.Expr"),
+                b -> b.addKeepClassRules("**.Expr"))
             // Keep the extension function
             .addKeepRules("-keep class **.LibKt { <methods>; }")
             .addKeepAttributes(ProguardKeepAttributes.RUNTIME_VISIBLE_ANNOTATIONS)