commit bbca351fdaf7b2e84664b898c43fefc984e77d1c
author Colin Cross <ccross@android.com> Thu Jul 20 21:03:27 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jul 20 21:03:27 2023 +0000
tree 06ed6a455680c049a4f12760a70d158844068ca5
parent e2bd0f2356cb9ed2b6b04a6b747310fae0922699
parent 1c2ffff125260489cd72ce71be4a4adf1049bd2e

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

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

Change-Id: Ie9c83ac2974349effd81d66715654a49ef847f0e
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 9c9c222..84111af 100644
--- a/Android.bp
+++ b/Android.bp
@@ -102,7 +102,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"],
 }