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

Commit 45abbc30 authored by Quang Luong's avatar Quang Luong Committed by Android (Google) Code Review
Browse files

Merge "Update min_sdk_versions to match WifiTrackerLib" into sc-dev

parents 6ed6e6e1 caa5c129

libs/WindowManager/Shell/Android.bp

+16 −15
Original line number Original line Diff line number Diff line
@@ -88,6 +88,7 @@ genrule { 
        "$(locations :wm_shell-sources)",

        "$(locations :wm_shell-sources)",

    out: ["wm_shell_protolog.json"],

    out: ["wm_shell_protolog.json"],

}

}



// End ProtoLog

// End ProtoLog





java_library {

java_library {
@@ -112,7 +113,7 @@ android_library { 
        "res",

        "res",

    ],

    ],

    java_resources: [

    java_resources: [

        ":generate-wm_shell_protolog.json"

        ":generate-wm_shell_protolog.json",

    ],

    ],

    static_libs: [

    static_libs: [

        "androidx.appcompat_appcompat",

        "androidx.appcompat_appcompat",
@@ -125,10 +126,10 @@ android_library { 
        "protolog-lib",

        "protolog-lib",

        "SettingsLib",

        "SettingsLib",

        "WindowManager-Shell-proto",

        "WindowManager-Shell-proto",

        "jsr330"

        "jsr330",

    ],

    ],

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

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

    manifest: "AndroidManifest.xml",

    manifest: "AndroidManifest.xml",





    min_sdk_version: "26",

    min_sdk_version: "30",

}
 
}

packages/SettingsLib/Android.bp

+1 −1
Original line number Original line Diff line number Diff line
@@ -32,7 +32,7 @@ android_library { 
        "src/**/*.kt",

        "src/**/*.kt",

    ],

    ],





    min_sdk_version: "21",

    min_sdk_version: "30",





}

}