Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 314668f8 authored by Zekan Qian's avatar Zekan Qian Committed by Android (Google) Code Review
Browse files

Merge "Add minSdkVersion in AndroidManifest for SpaLib & Gallery."

parents cf00b5bf 9c246c8d

packages/SettingsLib/Spa/build.gradle

+1 −0
Original line number Diff line number Diff line
@@ -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'

packages/SettingsLib/Spa/gallery/AndroidManifest.xml

+2 −0
Original line number Diff line number Diff line
@@ -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"

packages/SettingsLib/Spa/gallery/build.gradle

+2 −2
Original line number Diff line number Diff line
@@ -21,12 +21,12 @@ plugins { 


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"

    }

packages/SettingsLib/Spa/spa/AndroidManifest.xml

+4 −1
Original line number Diff line number Diff line
@@ -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>

packages/SettingsLib/Spa/spa/build.gradle

+2 −2
Original line number Diff line number Diff line
@@ -21,11 +21,11 @@ plugins { 


android {

    namespace 'com.android.settingslib.spa'

    compileSdk 33

    compileSdk spa_target_sdk



    defaultConfig {

        minSdk spa_min_sdk

        targetSdk 33

        targetSdk spa_target_sdk

    }



    sourceSets {