From 9fa02e02894644e3ddde39e479675a2ac344868c Mon Sep 17 00:00:00 2001
From: Anders Jenbo <anders@jenbo.dk>
Date: Mon, 25 Jul 2022 06:05:25 +0200
Subject: [PATCH] Bump NDK version

---
 .github/workflows/Android.yml                            | 5 -----
 CMake/platforms/android.cmake                            | 5 -----
 android-project/app/build.gradle                         | 5 ++++-
 android-project/gradle/wrapper/gradle-wrapper.properties | 4 ++--
 4 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/Android.yml b/.github/workflows/Android.yml
index 046454a00..4e98eddce 100644
--- a/.github/workflows/Android.yml
+++ b/.github/workflows/Android.yml
@@ -26,11 +26,6 @@ jobs:
         distribution: 'adopt'
         cache: gradle
 
-    # CMake version 3.21.3 causes gradle to throw a NullPointerException during the build
-    # Removing it will cause gradle to fall back on 3.18.1 installed by the Android SDK
-    - name: Create Build Environment
-      run: rm /usr/local/bin/cmake
-
     - name: Cache CMake build folder
       uses: actions/cache@v2
       with:
diff --git a/CMake/platforms/android.cmake b/CMake/platforms/android.cmake
index e2a6299a7..dd329ce71 100644
--- a/CMake/platforms/android.cmake
+++ b/CMake/platforms/android.cmake
@@ -25,8 +25,3 @@ set(UBSAN OFF)
 
 # Disable in-game options to exit the game.
 set(NOEXIT ON)
-
-if(CMAKE_BUILD_TYPE STREQUAL "Release")
-  # Work around a linker bug in clang: https://github.com/android/ndk/issues/721
-  set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -flto=full")
-endif()
diff --git a/android-project/app/build.gradle b/android-project/app/build.gradle
index ca9d77cd8..3fbe3d9dd 100644
--- a/android-project/app/build.gradle
+++ b/android-project/app/build.gradle
@@ -7,6 +7,9 @@ if (buildAsApplication) {
 }
 
 android {
+	//ndkVersion '25.0.8775105'
+	//ndkVersion '24.0.8215888'
+	ndkVersion '23.2.8568313'
 	compileSdkVersion 32
 	defaultConfig {
 		if (buildAsApplication) {
@@ -40,7 +43,7 @@ android {
 		externalNativeBuild {
 			cmake {
 				path '../../CMakeLists.txt'
-				version "3.13.0+"
+				version "3.22.1+"
 			}
 		}
 
diff --git a/android-project/gradle/wrapper/gradle-wrapper.properties b/android-project/gradle/wrapper/gradle-wrapper.properties
index cba6ca069..7b069090c 100644
--- a/android-project/gradle/wrapper/gradle-wrapper.properties
+++ b/android-project/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Nov 11 18:20:34 PST 2021
+#Mon Jul 25 04:46:02 CEST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME