Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update min_sdk_versions to match WifiTrackerLib

Browse Source 
SettingsLib min_sdk_version (and modules dependent on it) should
match the updated min_sdk_version of WifiTrackerlib (30)

Test: build
Bug: 162368129
Change-Id: I65a3246b40fc724b157756daec635392e99141e1
This commit is contained in:
Quang Luong
2021-03-11 11:55:38 -08:00
parent 6387cdfb91
commit caa5c1296a
2 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
libs/WindowManager/Shell/Android.bp
View File

@@ -55,13 +55,13 @@ genrule {
],
tools: ["protologtool"],
cmd: "$(location protologtool) transform-protolog-calls " +
"--protolog-class com.android.internal.protolog.common.ProtoLog " +
"--protolog-impl-class com.android.wm.shell.protolog.ShellProtoLogImpl " +
"--protolog-cache-class com.android.wm.shell.protolog.ShellProtoLogCache " +
"--loggroups-class com.android.wm.shell.protolog.ShellProtoLogGroup " +
"--loggroups-jar $(location :wm_shell_protolog-groups) " +
"--output-srcjar $(out) " +
"$(locations :wm_shell-sources)",
"--protolog-class com.android.internal.protolog.common.ProtoLog " +
"--protolog-impl-class com.android.wm.shell.protolog.ShellProtoLogImpl " +
"--protolog-cache-class com.android.wm.shell.protolog.ShellProtoLogCache " +
"--loggroups-class com.android.wm.shell.protolog.ShellProtoLogGroup " +
"--loggroups-jar $(location :wm_shell_protolog-groups) " +
"--output-srcjar $(out) " +
"$(locations :wm_shell-sources)",
out: ["wm_shell_protolog.srcjar"],
}
@@ -73,13 +73,14 @@ genrule {
],
tools: ["protologtool"],
cmd: "$(location protologtool) generate-viewer-config " +
"--protolog-class com.android.internal.protolog.common.ProtoLog " +
"--loggroups-class com.android.wm.shell.protolog.ShellProtoLogGroup " +
"--loggroups-jar $(location :wm_shell_protolog-groups) " +
"--viewer-conf $(out) " +
"$(locations :wm_shell-sources)",
"--protolog-class com.android.internal.protolog.common.ProtoLog " +
"--loggroups-class com.android.wm.shell.protolog.ShellProtoLogGroup " +
"--loggroups-jar $(location :wm_shell_protolog-groups) " +
"--viewer-conf $(out) " +
"$(locations :wm_shell-sources)",
out: ["wm_shell_protolog.json"],
}
// End ProtoLog
java_library {
@@ -104,7 +105,7 @@ android_library {
"res",
],
java_resources: [
":generate-wm_shell_protolog.json"
":generate-wm_shell_protolog.json",
],
static_libs: [
"androidx.appcompat_appcompat",
@@ -117,10 +118,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",
}

11
packages/SettingsLib/Android.bp
View File

@@ -17,8 +17,8 @@ android_library {
// TODO(b/149540986): revert this change.
static_libs: [
// All other dependent components should be put in
// "SettingsLibDependenciesWithoutWifiTracker".
// All other dependent components should be put in
// "SettingsLibDependenciesWithoutWifiTracker".
"WifiTrackerLib",
],
@@ -27,9 +27,12 @@ android_library {
resource_dirs: ["res"],
srcs: ["src/**/*.java", "src/**/*.kt"],
srcs: [
"src/**/*.java",
"src/**/*.kt",
],
min_sdk_version: "21",
min_sdk_version: "30",
}