diff options
| author | Ryan Houdek <Sonicadvance1@gmail.com> | 2016-01-20 11:43:46 -0500 |
|---|---|---|
| committer | Ryan Houdek <Sonicadvance1@gmail.com> | 2016-01-20 11:43:46 -0500 |
| commit | f4c1801c643d70d68be99a2e34da02cbaa77fc00 (patch) | |
| tree | ae5e2054af0f734cd679023d088a49b931c1511a /Source/Android | |
| parent | 15226b3dbb9b99af6a11a86316b19d27c9f8591f (diff) | |
| parent | c399eefdaa31f91f8027e359cf21b716ee918a84 (diff) | |
Merge pull request #3537 from Sonicadvance1/socially_accepted_stripping
Strip the Android shared library file.
Diffstat (limited to 'Source/Android')
| -rw-r--r-- | Source/Android/jni/CMakeLists.txt | 57 |
1 files changed, 29 insertions, 28 deletions
diff --git a/Source/Android/jni/CMakeLists.txt b/Source/Android/jni/CMakeLists.txt index 5132775be8..78dbe65db7 100644 --- a/Source/Android/jni/CMakeLists.txt +++ b/Source/Android/jni/CMakeLists.txt @@ -3,32 +3,33 @@ list(APPEND LIBS core uicommon) set(SRCS ButtonManager.cpp MainAndroid.cpp) -if(ANDROID) - set(DOLPHIN_EXE main) - add_library(${DOLPHIN_EXE} SHARED ${SRCS}) - target_link_libraries(${DOLPHIN_EXE} - log - android - "-Wl,--no-warn-mismatch" - "-Wl,--whole-archive" - ${LIBS} - "-Wl,--no-whole-archive" - ) - add_custom_command(TARGET ${DOLPHIN_EXE} POST_BUILD - COMMAND mkdir ARGS -p ${CMAKE_SOURCE_DIR}/Source/Android/app/src/main/jniLibs/${ANDROID_NDK_ABI_NAME} - ) - add_custom_command(TARGET ${DOLPHIN_EXE} POST_BUILD - COMMAND mkdir ARGS -p ${CMAKE_SOURCE_DIR}/Source/Android/app/src/main/assets/ - ) - add_custom_command(TARGET ${DOLPHIN_EXE} POST_BUILD - COMMAND cp ARGS ${LIBRARY_OUTPUT_PATH_ROOT}/libs/${ANDROID_NDK_ABI_NAME}/lib${DOLPHIN_EXE}.so ${CMAKE_SOURCE_DIR}/Source/Android/app/src/main/jniLibs/${ANDROID_NDK_ABI_NAME}/ - ) - add_custom_command(TARGET ${DOLPHIN_EXE} POST_BUILD - COMMAND cp ARGS ${CMAKE_SOURCE_DIR}/Data/Sys/GC/* ${CMAKE_SOURCE_DIR}/Source/Android/app/src/main/assets/ - ) - add_custom_command(TARGET ${DOLPHIN_EXE} POST_BUILD - COMMAND cp ARGS -r ${CMAKE_SOURCE_DIR}/Data/Sys/Shaders ${CMAKE_SOURCE_DIR}/Source/Android/app/src/main/assets/ - ) +set(SHARED_LIB main) +add_library(${SHARED_LIB} SHARED ${SRCS}) +target_link_libraries(${SHARED_LIB} +log +android +"-Wl,--no-warn-mismatch" +"-Wl,--whole-archive" +${LIBS} +"-Wl,--no-whole-archive" +) +add_custom_command(TARGET ${SHARED_LIB} POST_BUILD + COMMAND mkdir ARGS -p ${CMAKE_SOURCE_DIR}/Source/Android/app/src/main/jniLibs/${ANDROID_NDK_ABI_NAME} +) +add_custom_command(TARGET ${SHARED_LIB} POST_BUILD + COMMAND mkdir ARGS -p ${CMAKE_SOURCE_DIR}/Source/Android/app/src/main/assets/ +) +add_custom_command(TARGET ${SHARED_LIB} POST_BUILD + COMMAND cp ARGS ${LIBRARY_OUTPUT_PATH_ROOT}/libs/${ANDROID_NDK_ABI_NAME}/lib${SHARED_LIB}.so ${CMAKE_SOURCE_DIR}/Source/Android/app/src/main/jniLibs/${ANDROID_NDK_ABI_NAME}/ +) +add_custom_command(TARGET ${SHARED_LIB} POST_BUILD + COMMAND ${CMAKE_STRIP} ${CMAKE_SOURCE_DIR}/Source/Android/app/src/main/jniLibs/${ANDROID_NDK_ABI_NAME}/lib${SHARED_LIB}.so +) +add_custom_command(TARGET ${SHARED_LIB} POST_BUILD + COMMAND cp ARGS ${CMAKE_SOURCE_DIR}/Data/Sys/GC/* ${CMAKE_SOURCE_DIR}/Source/Android/app/src/main/assets/ +) +add_custom_command(TARGET ${SHARED_LIB} POST_BUILD + COMMAND cp ARGS -r ${CMAKE_SOURCE_DIR}/Data/Sys/Shaders ${CMAKE_SOURCE_DIR}/Source/Android/app/src/main/assets/ +) - set(CPACK_PACKAGE_EXECUTABLES ${CPACK_PACKAGE_EXECUTABLES} ${DOLPHIN_EXE}) -endif() +set(CPACK_PACKAGE_EXECUTABLES ${CPACK_PACKAGE_EXECUTABLES} ${SHARED_LIB}) |