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,
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"],
 }