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.
hrydgard · Apr 29, 2023 · e0a67c7 · e0a67c7
1 parent 91be4cf
commit e0a67c7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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) {