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

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

Browse Source
This commit is contained in:
Quang Luong
2021-03-19 17:04:58 +00:00
committed by Android (Google) Code Review
parent 2af4244cf4 0c3b94e971
commit 406c9fb61c
2 changed files with 19 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -63,13 +63,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"],
}
@@ -81,14 +81,13 @@ 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 {
@@ -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",
}

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,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",
}