Merge pull request #17358 from hrydgard/fix-xperia-play

Don't use the cpu_features library on Android arm32.
This commit is contained in:
Unknown W. Brackets 2023-04-29 15:18:29 -07:00 committed by GitHub
commit 25668fe4d2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions

View file

@ -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__)

View file

@ -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) {