From 87b27b3418ad533091b975f064225f41fa950e4b Mon Sep 17 00:00:00 2001
From: Sergii Pylypenko <x.pelya.x@gmail.com>
Date: Sat, 27 Nov 2021 23:13:15 +0200
Subject: [PATCH] SDL: updated project files to Android NDK 31

---
 project/AndroidManifestTemplate.xml              | 2 ++
 project/app/build-template.gradle                | 6 +++---
 project/build.gradle                             | 4 ++--
 project/gradle/wrapper/gradle-wrapper.properties | 2 +-
 project/jni/application/openttd/.gitignore       | 3 ++-
 project/jni/application/xserver/project.patch    | 6 +++---
 6 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/project/AndroidManifestTemplate.xml b/project/AndroidManifestTemplate.xml
index 071b67b2e..1bf6c31be 100644
--- a/project/AndroidManifestTemplate.xml
+++ b/project/AndroidManifestTemplate.xml
@@ -21,6 +21,7 @@
 				  android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation|screenSize|smallestScreenSize|layoutDirection"
 				  android:windowSoftInputMode="stateUnspecified"
 				  android:theme="@style/AppTheme"
+				  android:exported="true"
 		>
 			<intent-filter>
 				<action android:name="android.intent.action.MAIN" />
@@ -56,6 +57,7 @@
 				  android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation|screenSize|smallestScreenSize|layoutDirection"
 				  android:windowSoftInputMode="stateUnspecified"
 				  android:process=":RestartMainActivity"
+				  android:exported="true"
 		/>
 		<service android:name=".DummyService"
 				 android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation|screenSize|smallestScreenSize|layoutDirection"
diff --git a/project/app/build-template.gradle b/project/app/build-template.gradle
index d9dea55f3..d8e56c2c2 100644
--- a/project/app/build-template.gradle
+++ b/project/app/build-template.gradle
@@ -3,12 +3,12 @@ plugins {
 }
 
 android {
-    compileSdk 30
+    compileSdk 31
 
     defaultConfig {
         applicationId "net.olofson.ballfield"
         minSdk 16
-        targetSdk 30
+        targetSdk 31
     }
 
     buildTypes {
@@ -29,6 +29,6 @@ android {
 }
 
 dependencies {
-    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'androidx.appcompat:appcompat:1.3.1'
     implementation 'com.google.android.gms:play-services-games:21.0.0' // ==GOOGLEPLAYGAMESERVICES==
 }
diff --git a/project/build.gradle b/project/build.gradle
index 2399827d3..7cbb66447 100644
--- a/project/build.gradle
+++ b/project/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:7.0.1"
+        classpath "com.android.tools.build:gradle:7.0.3"
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -14,4 +14,4 @@ buildscript {
 
 task clean(type: Delete) {
     delete rootProject.buildDir
-}
+}
\ No newline at end of file
diff --git a/project/gradle/wrapper/gradle-wrapper.properties b/project/gradle/wrapper/gradle-wrapper.properties
index 9a4df18b8..a6de4ae08 100644
--- a/project/gradle/wrapper/gradle-wrapper.properties
+++ b/project/gradle/wrapper/gradle-wrapper.properties
@@ -1,4 +1,4 @@
-#Sun Aug 22 00:57:33 EEST 2021
+#Sat Nov 27 22:44:43 EET 2021
 distributionBase=GRADLE_USER_HOME
 distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
 distributionPath=wrapper/dists
diff --git a/project/jni/application/openttd/.gitignore b/project/jni/application/openttd/.gitignore
index 48596a3bb..6377bfc52 100644
--- a/project/jni/application/openttd/.gitignore
+++ b/project/jni/application/openttd/.gitignore
@@ -1,4 +1,5 @@
-openttd-build-*
+/openttd-build-*
 /AndroidData/*.xz
 /data
 /openttd-pc
+/build-tools
diff --git a/project/jni/application/xserver/project.patch b/project/jni/application/xserver/project.patch
index 25a4b9c20..38d9a1b42 100644
--- a/project/jni/application/xserver/project.patch
+++ b/project/jni/application/xserver/project.patch
@@ -1,6 +1,6 @@
 --- a/project/AndroidManifest.xml	2015-01-01 23:59:34.805231773 +0200
 +++ a/project/AndroidManifest.xml	2015-01-01 23:59:45.189378809 +0200
-@@ -43,6 +43,19 @@
+@@ -43,5 +43,19 @@
  				 android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation|screenSize|smallestScreenSize|layoutDirection"
  				 android:enabled="true"
  		/>
@@ -8,7 +8,8 @@
 +				  android:label="@string/app_name"
 +				  android:launchMode="standard"
 +				  android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation|screenSize|smallestScreenSize|layoutDirection"
-+				  android:windowSoftInputMode="stateUnspecified">
++				  android:windowSoftInputMode="stateUnspecified"
++				  android:exported="true">
 +			<intent-filter>
 +				<action android:name="android.intent.action.RUN" />
 +				<action android:name="android.intent.action.MAIN" />
@@ -19,4 +20,3 @@
 +		</activity>
  	</application>
  
- 	<uses-sdk android:minSdkVersion="9" android:targetSdkVersion="23"/>