From e0a67c770398660466474b8b2e3b042098a9ead7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= <hrydgard@gmail.com>
Date: Sat, 29 Apr 2023 23:54:47 +0200
Subject: [PATCH] Don't use the cpu_features library on Android arm32.

Unbreaks Xperia Play, yay.

Also bumps the compile tools version in the gradle, unrelated but
doesn't hurt.
---
 Common/ArmCPUDetect.cpp | 2 +-
 android/build.gradle    | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Common/ArmCPUDetect.cpp b/Common/ArmCPUDetect.cpp
index 4742e2b862..41b7475669 100644
--- a/Common/ArmCPUDetect.cpp
+++ b/Common/ArmCPUDetect.cpp
@@ -29,7 +29,7 @@
 #if PPSSPP_ARCH(ARM)
 #include "ext/cpu_features/include/cpuinfo_arm.h"
 
-#if defined(CPU_FEATURES_OS_LINUX) || defined(CPU_FEATURES_OS_ANDROID)
+#if defined(CPU_FEATURES_OS_LINUX)
 #define USE_CPU_FEATURES 1
 #endif
 #elif PPSSPP_ARCH(ARM64) && defined(__aarch64__)
diff --git a/android/build.gradle b/android/build.gradle
index c40615c070..face8e0b26 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -44,9 +44,11 @@ android {
 			}
 		}
 	}
-	compileSdkVersion 32
+
+	compileSdkVersion 33
 	ndkVersion "21.4.7075529"
 
+
 	defaultConfig {
 		applicationId 'org.ppsspp.ppsspp'
 		if (androidGitVersion.name() != "unknown" && androidGitVersion.code() >= 14000000) {