commit 1c2ffff125260489cd72ce71be4a4adf1049bd2e
author Colin Cross <ccross@android.com> Thu Jul 20 20:43:55 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jul 20 20:43:55 2023 +0000
tree ed990c5add43f8129bc43bde62353f88eee4432d
parent 90905c216d1b726dc72639609810ae492cbf7e9d
parent 87919cd45509b9e590c3218c69e64daae97cf624

Use -Xjvm-default=all instead of -Xjvm-default=enable or @JvmDefault am: 9088a4531c am: 8fc3abd355 am: 87919cd455

Original change: https://android-review.googlesource.com/c/platform/packages/apps/ThemePicker/+/2666060

Change-Id: I4b254ffb6c8f9114cc3b7f76265eb30b6a7232ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Android.bp

diff --git a/Android.bp b/Android.bp
index f6c8558..3694ea0 100644
--- a/Android.bp
+++ b/Android.bp
@@ -101,7 +101,7 @@
     optimize: {
         enabled: false,
     },
-    kotlincflags: ["-Xjvm-default=enable"],
+    kotlincflags: ["-Xjvm-default=all"],
     certificate: "",
 
     privileged: true,

tests/Android.bp

diff --git a/tests/Android.bp b/tests/Android.bp
index 9fed740..9df2720 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -41,7 +41,7 @@
         "android.test.mock",
     ],
 
-    kotlincflags: ["-Xjvm-default=enable"],
+    kotlincflags: ["-Xjvm-default=all"],
     platform_apis: true,
     test_suites: ["device-tests"],
 }