From 9c695c832459f7ed41698a415737c12bc8c7d915 Mon Sep 17 00:00:00 2001 From: SachinVin Date: Mon, 18 Apr 2022 13:10:25 +0530 Subject: [PATCH] Android: rename android JNI from main to citra-android --- src/CMakeLists.txt | 2 +- .../src/main/java/org/citra/citra_emu/NativeLibrary.java | 2 +- src/android/app/src/main/jni/CMakeLists.txt | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b3a5bc640..7ec5dc26a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -120,7 +120,7 @@ endif() if (ANDROID) add_subdirectory(android/app/src/main/jni) - target_include_directories(main PRIVATE android/app/src/main) + target_include_directories(citra-android PRIVATE android/app/src/main) else() add_subdirectory(dedicated_room) endif() diff --git a/src/android/app/src/main/java/org/citra/citra_emu/NativeLibrary.java b/src/android/app/src/main/java/org/citra/citra_emu/NativeLibrary.java index d842a805f..90d774f6c 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/NativeLibrary.java +++ b/src/android/app/src/main/java/org/citra/citra_emu/NativeLibrary.java @@ -60,7 +60,7 @@ public final class NativeLibrary { static { try { - System.loadLibrary("main"); + System.loadLibrary("citra-android"); } catch (UnsatisfiedLinkError ex) { Log.error("[NativeLibrary] " + ex.toString()); } diff --git a/src/android/app/src/main/jni/CMakeLists.txt b/src/android/app/src/main/jni/CMakeLists.txt index 3fd3a3eab..bdb4d14fc 100644 --- a/src/android/app/src/main/jni/CMakeLists.txt +++ b/src/android/app/src/main/jni/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library(main SHARED +add_library(citra-android SHARED applets/mii_selector.cpp applets/mii_selector.h applets/swkbd.cpp @@ -28,7 +28,7 @@ add_library(main SHARED ndk_motion.h ) -target_link_libraries(main PRIVATE audio_core common core input_common network) -target_link_libraries(main PRIVATE android camera2ndk mediandk jnigraphics EGL glad inih log yuv) +target_link_libraries(citra-android PRIVATE audio_core common core input_common network) +target_link_libraries(citra-android PRIVATE android camera2ndk mediandk jnigraphics EGL glad inih log yuv) -set(CPACK_PACKAGE_EXECUTABLES ${CPACK_PACKAGE_EXECUTABLES} main) +set(CPACK_PACKAGE_EXECUTABLES ${CPACK_PACKAGE_EXECUTABLES} citra-android)