Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b67ed6fc authored by Colin Cross's avatar Colin Cross Committed by Cherrypicker Worker
Browse files

Use -Xjvm-default=all instead of -Xjvm-default=enable or @JvmDefault 

The @JvmDefault annotation and -Xjvm-default=enable argument are both
removed from kotlinc 1.9.0 in favor of -Xjvm-default=all.

Bug: 291335478
Test: builds
(cherry picked from https://android-review.googlesource.com/q/commit:9088a4531c4ecffae92f907634b39707bd05a3bf)
Merged-In: I65f61004ebb3e85271af2fce3b64e29bc403933d
Change-Id: I65f61004ebb3e85271af2fce3b64e29bc403933d
parent bcb07ac4

Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ java_defaults { 
    optimize: {

        enabled: false,

    },

    kotlincflags: ["-Xjvm-default=enable"],

    kotlincflags: ["-Xjvm-default=all"],

    certificate: "",



    privileged: true,

tests/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ android_test { 
        "android.test.mock",

    ],



    kotlincflags: ["-Xjvm-default=enable"],

    kotlincflags: ["-Xjvm-default=all"],

    platform_apis: true,

    test_suites: ["device-tests"],

}