From 1fb271f6e1b01b3ceef6f02f6f34d8f4427f9ea5 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Thu, 20 May 2021 10:43:23 -0700
Subject: [PATCH] Fixing some errorprone build rules

Bug: 186259590
Test: Presubmit
Change-Id: I3a4a306a0351a67d53e35a6919296dbda8649766
---
 Android.bp | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/Android.bp b/Android.bp
index 7e6a565f46..1b6ffe42b7 100644
--- a/Android.bp
+++ b/Android.bp
@@ -16,6 +16,8 @@ package {
     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 @@ java_library {
     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 @@ android_library {
     ],
     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 @@ android_library {
     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 @@ android_app {
     },
 
     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 @@ android_library {
         "SystemUI-statsd",
     ],
     manifest: "quickstep/AndroidManifest.xml",
-    min_sdk_version: "28",
+    min_sdk_version: "current",
 }
 
 
@@ -244,7 +246,7 @@ android_library {
         "go/AndroidManifest.xml",
         "AndroidManifest-common.xml",
     ],
-    min_sdk_version: "29",
+    min_sdk_version: "current",
     lint: {
         baseline_filename: "lint-baseline-go-res-lib.xml",
     },