Add minSdkVersion in AndroidManifest for SpaLib & Gallery.
Bug: 244122804
Test: manual - build gallery
Change-Id: Id8c54243a6da468324594df062918e0917e216ac
diff --git a/packages/SettingsLib/Spa/build.gradle b/packages/SettingsLib/Spa/build.gradle
index 811cdd8..68c63da 100644
--- a/packages/SettingsLib/Spa/build.gradle
+++ b/packages/SettingsLib/Spa/build.gradle
@@ -17,6 +17,7 @@
buildscript {
ext {
spa_min_sdk = 21
+ spa_target_sdk = 33
jetpack_compose_version = '1.2.0-alpha04'
jetpack_compose_compiler_version = '1.3.2'
jetpack_compose_material3_version = '1.0.0-alpha06'
diff --git a/packages/SettingsLib/Spa/gallery/AndroidManifest.xml b/packages/SettingsLib/Spa/gallery/AndroidManifest.xml
index 0a4972f..2ed8bca 100644
--- a/packages/SettingsLib/Spa/gallery/AndroidManifest.xml
+++ b/packages/SettingsLib/Spa/gallery/AndroidManifest.xml
@@ -17,6 +17,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.android.settingslib.spa.gallery">
+ <uses-sdk android:minSdkVersion="21"/>
+
<application
android:name=".GalleryApplication"
android:icon="@mipmap/ic_launcher"
diff --git a/packages/SettingsLib/Spa/gallery/build.gradle b/packages/SettingsLib/Spa/gallery/build.gradle
index 551a0b1..c1ce7d9 100644
--- a/packages/SettingsLib/Spa/gallery/build.gradle
+++ b/packages/SettingsLib/Spa/gallery/build.gradle
@@ -21,12 +21,12 @@
android {
namespace 'com.android.settingslib.spa.gallery'
- compileSdk 33
+ compileSdk spa_target_sdk
defaultConfig {
applicationId "com.android.settingslib.spa.gallery"
minSdk spa_min_sdk
- targetSdk 33
+ targetSdk spa_target_sdk
versionCode 1
versionName "1.0"
}
diff --git a/packages/SettingsLib/Spa/spa/AndroidManifest.xml b/packages/SettingsLib/Spa/spa/AndroidManifest.xml
index 410bcdb..62800bd 100644
--- a/packages/SettingsLib/Spa/spa/AndroidManifest.xml
+++ b/packages/SettingsLib/Spa/spa/AndroidManifest.xml
@@ -14,4 +14,7 @@
limitations under the License.
-->
-<manifest package="com.android.settingslib.spa" />
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="com.android.settingslib.spa">
+ <uses-sdk android:minSdkVersion="21"/>
+</manifest>
diff --git a/packages/SettingsLib/Spa/spa/build.gradle b/packages/SettingsLib/Spa/spa/build.gradle
index 7e05e75..c587411 100644
--- a/packages/SettingsLib/Spa/spa/build.gradle
+++ b/packages/SettingsLib/Spa/spa/build.gradle
@@ -21,11 +21,11 @@
android {
namespace 'com.android.settingslib.spa'
- compileSdk 33
+ compileSdk spa_target_sdk
defaultConfig {
minSdk spa_min_sdk
- targetSdk 33
+ targetSdk spa_target_sdk
}
sourceSets {
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",
}
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>
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"
}