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

Commit 2e931873 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Use -Xjvm-default=all instead of -Xjvm-default=enable or @JvmDefault" into main

parents 89cc2c3b fbd05dd7

libs/WindowManager/Shell/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ android_library { 
        // *.kt sources are inside a filegroup.

        "kotlin-annotations",

    ],

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

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

    manifest: "AndroidManifest.xml",

    plugins: ["dagger2-compiler"],

}

libs/WindowManager/Shell/src/com/android/wm/shell/common/FloatingContentCoordinator.kt

+0 −1
Original line number Diff line number Diff line
@@ -94,7 +94,6 @@ class FloatingContentCoordinator constructor() { 
         * non-overlapping.

         * @return The new bounds for this content.

         */

        @JvmDefault

        fun calculateNewBoundsOnOverlap(

            overlappingContentBounds: Rect,

            otherContentBounds: List<Rect>

libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopModeTaskRepository.kt

+0 −2
Original line number Diff line number Diff line
@@ -173,7 +173,6 @@ class DesktopModeTaskRepository { 
        /**

         * Called when the active tasks change in desktop mode.

         */

        @JvmDefault

        fun onActiveTasksChanged() {}

    }
@@ -184,7 +183,6 @@ class DesktopModeTaskRepository { 
        /**

         * Called when the desktop starts or stops showing freeform tasks.

         */

        @JvmDefault

        fun onVisibilityChanged(hasVisibleFreeformTasks: Boolean) {}

    }

}

libs/WindowManager/Shell/tests/unittest/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ android_test { 
        "libstaticjvmtiagent",

    ],



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

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



    plugins: ["dagger2-compiler"],

packages/EasterEgg/Android.bp

+12 −9
Original line number Diff line number Diff line
@@ -26,7 +26,10 @@ package { 
android_app {

    // the build system in pi-dev can't quite handle R.java in kt

    // so we will have a mix of java and kotlin files

    srcs: ["src/**/*.java", "src/**/*.kt"],

    srcs: [

        "src/**/*.java",

        "src/**/*.kt",

    ],



    resource_dirs: ["res"],
@@ -50,5 +53,5 @@ android_app { 


    manifest: "AndroidManifest.xml",



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

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

}