Merge pull request #21970 from hrydgard/android-buildfix

Fix Android CMakeLists.txt build
This commit is contained in:
Henrik Rydgård authored and GitHub committed 2026-07-24 17:17:15 +02:00
commit 93bfd41e78
2 files changed
+1 -10

No files matched your search

+1 -4
View File
@@ -2757,13 +2757,10 @@ add_dependencies(core GitVersion)
if(ANDROID AND NOT LIBRETRO)
add_library(ppsspp_jni SHARED ${AndroidJniSource})
target_link_libraries(ppsspp_jni core)
target_link_libraries(ppsspp_jni core log EGL OpenSLES)
if(TARGET ppsspp_ui)
target_link_libraries(ppsspp_jni ppsspp_ui)
endif()
if(TARGET native)
target_link_libraries(ppsspp_jni native)
endif()
if(ARM64)
# Support 16kb page size on Android
target_link_options(ppsspp_jni PRIVATE "-Wl,-z,max-page-size=16384")
-6
View File
@@ -274,12 +274,6 @@ void NativeGetAppInfo(std::string *app_dir_name, std::string *app_nice_name, boo
*app_dir_name = "ppsspp";
*landscape = true;
*version = PPSSPP_GIT_VERSION;
#if PPSSPP_ARCH(ARM) && defined(__ANDROID__)
ArmEmitterTest();
#elif PPSSPP_ARCH(ARM64) && defined(__ANDROID__)
Arm64EmitterTest();
#endif
}
#if defined(USING_WIN_UI) && !PPSSPP_PLATFORM(UWP)