From 5dea4ecfdfe9ae33f4f992f8256f7fe49d624ccc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= <hrydgard@gmail.com>
Date: Sat, 13 Mar 2021 15:49:25 +0100
Subject: [PATCH] Android: Add a dependency on the AndroidX appcompat library.

It's apache licensed so it's ok, and I need it for some Storage Access
Framework work for #11997.
---
 android/AndroidManifest.xml              | 6 +++++-
 android/build.gradle                     | 8 ++++++++
 android/gradle.properties                | 2 ++
 build.gradle                             | 2 +-
 gradle.properties                        | 3 +++
 gradle/wrapper/gradle-wrapper.properties | 2 ++
 6 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 gradle.properties

diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index cc8739cf29..f9314abf7b 100644
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
     package="org.ppsspp.ppsspp"
     android:installLocation="auto"
     android:versionCode="111020000"
@@ -28,7 +29,10 @@
     <uses-permission-sdk-23 android:name="android.permission.CAMERA" />
     <uses-permission-sdk-23 android:name="android.permission.RECORD_AUDIO" />
 
-    <supports-screens
+	<!-- AndroidX minimum SDK workaround. We don't care if it's broken on older versions. -->
+	<uses-sdk tools:overrideLibrary="androidx.appcompat.resources,androidx.appcompat,androidx.fragment,androidx.drawerlayout,androidx.vectordrawable.animated,androidx.vectordrawable,androidx.viewpager,androidx.loader,androidx.activity,androidx.annotation,androidx.customview,androidx.cursoradapter,androidx.arch,androidx.collection,androidx.core,androidx.versionedparcelable,androidx.interpolator,androidx.lifecycle,androidx.loader,androidx.savedstate,androidx.lifecycle.viewmodel,androidx.lifecycle.livedata,androidx.lifecycle.livedata.core,androidx.arch.core"/>
+
+	<supports-screens
         android:largeScreens="true"
         android:normalScreens="true"
         android:smallScreens="true"
diff --git a/android/build.gradle b/android/build.gradle
index aedd4e852f..b2c2f467bf 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -10,6 +10,14 @@ androidGitVersion {
 	untrackedIsDirty = false
 }
 
+dependencies {
+	def appcompat_version = "1.2.0"
+
+	implementation "androidx.appcompat:appcompat:$appcompat_version"
+	// For loading and tinting drawables on older versions of the platform
+	implementation "androidx.appcompat:appcompat-resources:$appcompat_version"
+}
+
 android {
 	flavorDimensions "variant"
 
diff --git a/android/gradle.properties b/android/gradle.properties
index 8bd86f6805..4d3226abc2 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -1 +1,3 @@
 org.gradle.jvmargs=-Xmx1536M
+android.useAndroidX=true
+android.enableJetifier=true
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index c8274d0b58..3d059bcdce 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:4.1.2'
-    }
+	}
 }
 
 allprojects {
diff --git a/gradle.properties b/gradle.properties
new file mode 100644
index 0000000000..4d3226abc2
--- /dev/null
+++ b/gradle.properties
@@ -0,0 +1,3 @@
+org.gradle.jvmargs=-Xmx1536M
+android.useAndroidX=true
+android.enableJetifier=true
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index bab4a13390..b145d5dc22 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -4,3 +4,5 @@ distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
 distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
+android.useAndroidX=true
+android.enableJetifier=true