Merge pull request #17786 from zoltanvb/android-patch-fix

retroarch-android-debug.diff

@@ -2,20 +2,18 @@ diff --git a/pkg/android/phoenix/AndroidManifest.xml b/pkg/android/phoenix/Andro
 index ce2114c..12d8fbb 100644
 --- a/pkg/android/phoenix/AndroidManifest.xml
 +++ b/pkg/android/phoenix/AndroidManifest.xml
-@@ -21,7 +21,8 @@
-         android:label="RetroArch"
+@@ -24,6 +24,7 @@
          android:hasCode="true"
          android:isGame="true"
--        android:banner="@drawable/banner">
-+        android:banner="@drawable/banner"
-+        android:debuggable="true">
-         <meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version" />
-         <activity android:name="com.retroarch.browser.mainmenu.MainMenuActivity" android:exported="true" android:launchMode="singleInstance">
-             <intent-filter>
+         android:banner="@drawable/banner"
++        android:debuggable="true"
+         android:extractNativeLibs="true"
+         android:requestLegacyExternalStorage="true"
+         tools:ignore="UnusedAttribute">
 diff --git a/pkg/android/phoenix/build.xml b/pkg/android/phoenix/build.xml
 index 9698a04..6b2c101 100644
---- a/pkg/android/phoenix/build.xml
-+++ b/pkg/android/phoenix/build.xml
+--- a/pkg/android/phoenix-legacy/build.xml
++++ b/pkg/android/phoenix-legacy/build.xml
 @@ -96,7 +96,7 @@
                <replaceregexp
                        file="AndroidManifest.xml"
@@ -27,8 +25,8 @@ index 9698a04..6b2c101 100644
         <exec executable="${ndk.dir}/${ndk.cmd}" failonerror="true">
 diff --git a/pkg/android/phoenix/jni/Application.mk b/pkg/android/phoenix/jni/Application.mk
 index b179dbf..84ade89 100644
---- a/pkg/android/phoenix/jni/Application.mk
-+++ b/pkg/android/phoenix/jni/Application.mk
+--- a/pkg/android/phoenix-common/jni/Application.mk
++++ b/pkg/android/phoenix-common/jni/Application.mk
 @@ -1,3 +1,5 @@
 +APP_OPTIM := debug
 +