Merge pull request #10212 from JosJuice/android-12

Android: Increase targetSdkVersion to 31 (Android 12)
dolphin-emu · Jan 6, 2022 · c16b8f4 · c16b8f4
2 parents 6939fd9 + 51034ac
commit c16b8f4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Source/Android/app/build.gradle b/Source/Android/app/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 31
     ndkVersion "23.0.7599858"
 
     compileOptions {
@@ -26,7 +26,7 @@ android {
         // TODO If this is ever modified, change application_id in strings.xml
         applicationId "org.dolphinemu.dolphinemu"
         minSdkVersion 21
-        targetSdkVersion 30
+        targetSdkVersion 31
 
         versionCode(getBuildVersionCode())
 

diff --git a/Source/Android/app/src/main/AndroidManifest.xml b/Source/Android/app/src/main/AndroidManifest.xml
@@ -29,7 +29,6 @@
         android:name="android.permission.VIBRATE"
         android:required="false"/>
 
-    <!-- Once compileSdkVersion is 31, add: android:dataExtractionRules="@xml/backup_rules_api_31" -->
     <application
         android:name=".DolphinApplication"
         android:label="@string/app_name"
@@ -38,6 +37,7 @@
         android:preserveLegacyExternalStorage="true"
         android:allowBackup="true"
         android:fullBackupContent="@xml/backup_rules"
+        android:dataExtractionRules="@xml/backup_rules_api_31"
         android:supportsRtl="true"
         android:isGame="true"
         android:banner="@drawable/banner_tv"