Fixing some errorprone build rules
Bug: 186259590
Test: Presubmit
Change-Id: I3a4a306a0351a67d53e35a6919296dbda8649766
diff --git a/Android.bp b/Android.bp
index 7e6a565..1b6ffe4 100644
--- a/Android.bp
+++ b/Android.bp
@@ -16,6 +16,8 @@
default_applicable_licenses: ["packages_apps_Launcher3_license"],
}
+min_launcher3_sdk_version = "26"
+
// Added automatically by a large-scale-change
// See: http://go/android-license-faq
license {
@@ -92,7 +94,7 @@
srcs: ["src_plugins/**/*.java"],
sdk_version: "current",
- min_sdk_version: "28",
+ min_sdk_version: min_launcher3_sdk_version,
}
// Library with all the dependencies for building Launcher3
@@ -114,7 +116,7 @@
],
manifest: "AndroidManifest-common.xml",
sdk_version: "current",
- min_sdk_version: "26",
+ min_sdk_version: min_launcher3_sdk_version,
lint: {
baseline_filename: "lint-baseline-res-lib.xml",
},
@@ -128,7 +130,7 @@
srcs: ["src_build_config/**/*.java"],
static_libs: ["Launcher3ResLib"],
sdk_version: "current",
- min_sdk_version: "26",
+ min_sdk_version: min_launcher3_sdk_version,
manifest: "AndroidManifest-common.xml",
lint: {
baseline_filename: "lint-baseline-common-deps-lib.xml",
@@ -160,8 +162,8 @@
},
sdk_version: "current",
- min_sdk_version: "26",
- target_sdk_version: "29",
+ min_sdk_version: min_launcher3_sdk_version,
+ target_sdk_version: "current",
privileged: true,
system_ext_specific: true,
@@ -195,7 +197,7 @@
"SystemUI-statsd",
],
manifest: "quickstep/AndroidManifest.xml",
- min_sdk_version: "28",
+ min_sdk_version: "current",
}
@@ -244,7 +246,7 @@
"go/AndroidManifest.xml",
"AndroidManifest-common.xml",
],
- min_sdk_version: "29",
+ min_sdk_version: "current",
lint: {
baseline_filename: "lint-baseline-go-res-lib.xml",
},