diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3251ad12f6..fb00a008b8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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")
diff --git a/UI/NativeApp.cpp b/UI/NativeApp.cpp
index b81442a543..c2fa524e8e 100644
--- a/UI/NativeApp.cpp
+++ b/UI/NativeApp.cpp
@@ -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)