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

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

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

parents 2af4244c 0c3b94e9

libs/WindowManager/Shell/Android.bp

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

    out: ["wm_shell_protolog.json"],

}



// End ProtoLog



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

    ],

    java_resources: [

        ":generate-wm_shell_protolog.json",

        ":generate-wm_shell_protolog.json"

    ],

    static_libs: [

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

        "SettingsLib",

        "WindowManager-Shell-proto",

        "jsr330",

        "jsr330"

    ],

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

    manifest: "AndroidManifest.xml",



    min_sdk_version: "30",

    min_sdk_version: "26",

}

packages/SettingsLib/Android.bp

+4 −7
Original line number Diff line number Diff line
@@ -27,12 +27,9 @@ android_library { 


    resource_dirs: ["res"],



    srcs: [

        "src/**/*.java",

        "src/**/*.kt",

    ],

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



    min_sdk_version: "30",

    min_sdk_version: "21",



}