From 51034ac2dc73aa6cabcc21c6e7eb09af6c4d3d02 Mon Sep 17 00:00:00 2001
From: JosJuice <josjuice@gmail.com>
Date: Sat, 13 Nov 2021 15:38:03 +0100
Subject: [PATCH] Android: Increase targetSdkVersion to 31 (Android 12)

Unlike with Android 11, there should be no downsides to doing
this, so we might as well get this out of the way early.
The main part of the work was already done in 5a1a642.
---
 Source/Android/app/build.gradle                 | 4 ++--
 Source/Android/app/src/main/AndroidManifest.xml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Source/Android/app/build.gradle b/Source/Android/app/build.gradle
index 9aca6bf771..60f5e3a81e 100644
--- 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
index e46eaf7797..a9a8b9796d 100644
--- 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"