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

Commit 6f79bf6b authored by Quang Luong's avatar Quang Luong Committed by Automerger Merge Worker
Browse files

Merge "Update min_sdk_versions to match WifiTrackerLib" into sc-dev am: 45abbc30 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13842469

Change-Id: Ie752e7b946aa8a8e1b00b3d6892f86dc119ae433
parents 0ec88260 45abbc30

libs/WindowManager/Shell/Android.bp

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

    out: ["wm_shell_protolog.json"],

}



// End ProtoLog



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

    ],

    java_resources: [

        ":generate-wm_shell_protolog.json"

        ":generate-wm_shell_protolog.json",

    ],

    static_libs: [

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

        "SettingsLib",

        "WindowManager-Shell-proto",

        "jsr330"

        "jsr330",

    ],

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

    manifest: "AndroidManifest.xml",



    min_sdk_version: "26",

    min_sdk_version: "30",

}

packages/SettingsLib/Android.bp

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

    ],



    min_sdk_version: "21",

    min_sdk_version: "30",



}