From aa20e3b5139bc2d1e38e0e0ca33bcb7f77758306 Mon Sep 17 00:00:00 2001
From: Braden Farmer <farmerbb@gmail.com>
Date: Sun, 1 Nov 2020 20:38:23 -0700
Subject: [PATCH 1/2] [Android] Move to targetSdkVersion 29

---
 pkg/android/phoenix/AndroidManifest.xml          | 1 +
 pkg/android/phoenix/build.gradle                 | 6 +++---
 pkg/android/phoenix/module_template/build.gradle | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkg/android/phoenix/AndroidManifest.xml b/pkg/android/phoenix/AndroidManifest.xml
index 7551234520..acd6880395 100644
--- a/pkg/android/phoenix/AndroidManifest.xml
+++ b/pkg/android/phoenix/AndroidManifest.xml
@@ -24,6 +24,7 @@
         android:isGame="true"
         android:banner="@drawable/banner"
         android:extractNativeLibs="true"
+        android:requestLegacyExternalStorage="true"
         tools:ignore="UnusedAttribute">
         <activity android:name="com.retroarch.browser.mainmenu.MainMenuActivity" android:exported="true" android:launchMode="singleInstance">
             <intent-filter>
diff --git a/pkg/android/phoenix/build.gradle b/pkg/android/phoenix/build.gradle
index 07e0805c78..1e85ef0a67 100644
--- a/pkg/android/phoenix/build.gradle
+++ b/pkg/android/phoenix/build.gradle
@@ -25,8 +25,8 @@ allprojects {
 apply plugin: 'com.android.application'
 
 android {
-  compileSdkVersion 28
-  buildToolsVersion "28.0.3"
+  compileSdkVersion 29
+  buildToolsVersion "29.0.3"
 
   flavorDimensions "variant"
 
@@ -37,7 +37,7 @@ android {
         arguments "-j${Runtime.runtime.availableProcessors()}"
       }
     }
-    targetSdkVersion 28
+    targetSdkVersion 29
   }
 
   productFlavors {
diff --git a/pkg/android/phoenix/module_template/build.gradle b/pkg/android/phoenix/module_template/build.gradle
index 40ed487408..2856c7dd4b 100644
--- a/pkg/android/phoenix/module_template/build.gradle
+++ b/pkg/android/phoenix/module_template/build.gradle
@@ -1,10 +1,10 @@
 apply plugin: 'com.android.dynamic-feature'
 
 android {
-  compileSdkVersion 28
+  compileSdkVersion 29
   defaultConfig {
     minSdkVersion 21
-    targetSdkVersion 28
+    targetSdkVersion 29
   }
 
   flavorDimensions "variant"

From f9b3eb892b244ef5186cae2c3bfe678ad389d306 Mon Sep 17 00:00:00 2001
From: Braden Farmer <farmerbb@gmail.com>
Date: Sun, 1 Nov 2020 20:55:26 -0700
Subject: [PATCH 2/2] Update Travis config for new Android targetSdkVersion

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5af82f59d7..908095b3c9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -99,8 +99,8 @@ matrix:
       android:
         components:
           - tools
-          - build-tools-28.0.3
-          - android-28
+          - build-tools-29.0.3
+          - android-29
       install:
         - echo y | sdkmanager "ndk-bundle"
       before_script: