commit 9c246c8d7566b6d4eea4c6bc94c1068f6c9cadd1
author Zekan Qian <pierreqian@google.com> Tue Oct 18 19:16:38 2022 +0800
committer Zekan Qian <pierreqian@google.com> Wed Oct 19 16:26:12 2022 +0800
tree f535158f252865f3d41e0343f94d20e1c1366973
parent 5260ad78ee79ea23ce82b72d21095892016f6a3e

Add minSdkVersion in AndroidManifest for SpaLib & Gallery.

Bug: 244122804
Test: manual - build gallery
Change-Id: Id8c54243a6da468324594df062918e0917e216ac

packages/SettingsLib/Spa/tests/Android.bp

diff --git a/packages/SettingsLib/Spa/tests/Android.bp b/packages/SettingsLib/Spa/tests/Android.bp
index 1ce49fa..7491045 100644
--- a/packages/SettingsLib/Spa/tests/Android.bp
+++ b/packages/SettingsLib/Spa/tests/Android.bp
@@ -34,4 +34,5 @@
         "truth-prebuilt",
     ],
     kotlincflags: ["-Xjvm-default=all"],
+    min_sdk_version: "31",
 }

packages/SettingsLib/Spa/tests/AndroidManifest.xml

diff --git a/packages/SettingsLib/Spa/tests/AndroidManifest.xml b/packages/SettingsLib/Spa/tests/AndroidManifest.xml
index c224caf..e2db594 100644
--- a/packages/SettingsLib/Spa/tests/AndroidManifest.xml
+++ b/packages/SettingsLib/Spa/tests/AndroidManifest.xml
@@ -17,6 +17,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.android.settingslib.spa.tests">
 
+    <uses-sdk android:minSdkVersion="21"/>
+
     <application>
         <uses-library android:name="android.test.runner" />
     </application>

packages/SettingsLib/Spa/tests/build.gradle

diff --git a/packages/SettingsLib/Spa/tests/build.gradle b/packages/SettingsLib/Spa/tests/build.gradle
index f950e01..b43bf18 100644
--- a/packages/SettingsLib/Spa/tests/build.gradle
+++ b/packages/SettingsLib/Spa/tests/build.gradle
@@ -21,11 +21,11 @@
 
 android {
     namespace 'com.android.settingslib.spa.tests'
-    compileSdk 33
+    compileSdk spa_target_sdk
 
     defaultConfig {
         minSdk spa_min_sdk
-        targetSdk 33
+        targetSdk spa_target_sdk
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }