Merge pull request #10212 from JosJuice/android-12
Android: Increase targetSdkVersion to 31 (Android 12)
This commit is contained in:
commit
c16b8f4200
|
@ -1,7 +1,7 @@
|
||||||
apply plugin: 'com.android.application'
|
apply plugin: 'com.android.application'
|
||||||
|
|
||||||
android {
|
android {
|
||||||
compileSdkVersion 30
|
compileSdkVersion 31
|
||||||
ndkVersion "23.0.7599858"
|
ndkVersion "23.0.7599858"
|
||||||
|
|
||||||
compileOptions {
|
compileOptions {
|
||||||
|
@ -26,7 +26,7 @@ android {
|
||||||
// TODO If this is ever modified, change application_id in strings.xml
|
// TODO If this is ever modified, change application_id in strings.xml
|
||||||
applicationId "org.dolphinemu.dolphinemu"
|
applicationId "org.dolphinemu.dolphinemu"
|
||||||
minSdkVersion 21
|
minSdkVersion 21
|
||||||
targetSdkVersion 30
|
targetSdkVersion 31
|
||||||
|
|
||||||
versionCode(getBuildVersionCode())
|
versionCode(getBuildVersionCode())
|
||||||
|
|
||||||
|
|
|
@ -29,7 +29,6 @@
|
||||||
android:name="android.permission.VIBRATE"
|
android:name="android.permission.VIBRATE"
|
||||||
android:required="false"/>
|
android:required="false"/>
|
||||||
|
|
||||||
<!-- Once compileSdkVersion is 31, add: android:dataExtractionRules="@xml/backup_rules_api_31" -->
|
|
||||||
<application
|
<application
|
||||||
android:name=".DolphinApplication"
|
android:name=".DolphinApplication"
|
||||||
android:label="@string/app_name"
|
android:label="@string/app_name"
|
||||||
|
@ -38,6 +37,7 @@
|
||||||
android:preserveLegacyExternalStorage="true"
|
android:preserveLegacyExternalStorage="true"
|
||||||
android:allowBackup="true"
|
android:allowBackup="true"
|
||||||
android:fullBackupContent="@xml/backup_rules"
|
android:fullBackupContent="@xml/backup_rules"
|
||||||
|
android:dataExtractionRules="@xml/backup_rules_api_31"
|
||||||
android:supportsRtl="true"
|
android:supportsRtl="true"
|
||||||
android:isGame="true"
|
android:isGame="true"
|
||||||
android:banner="@drawable/banner_tv"
|
android:banner="@drawable/banner_tv"
|
||||||
|
|
Loading…
Reference in New Issue