ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3537 from Sonicadvance1/socially_accepted_stripping 

Strip the Android shared library file.
This commit is contained in:
Ryan Houdek 2016-01-20 11:43:46 -05:00
parent 15226b3dbb c399eefdaa
commit f4c1801c64
2 changed files with 32 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
Source/Android/jni/CMakeLists.txt
View File

@ -3,32 +3,33 @@ list(APPEND LIBS core uicommon)
set(SRCS ButtonManager.cpp set(SRCS ButtonManager.cpp
MainAndroid.cpp) MainAndroid.cpp)
if(ANDROID) set(SHARED_LIB main)
set(DOLPHIN_EXE main) add_library(${SHARED_LIB} SHARED ${SRCS})
add_library(${DOLPHIN_EXE} SHARED ${SRCS}) target_link_libraries(${SHARED_LIB}
target_link_libraries(${DOLPHIN_EXE} log
log android
android "-Wl,--no-warn-mismatch"
"-Wl,--no-warn-mismatch" "-Wl,--whole-archive"
"-Wl,--whole-archive" ${LIBS}
${LIBS} "-Wl,--no-whole-archive"
"-Wl,--no-whole-archive" )
) add_custom_command(TARGET ${SHARED_LIB} POST_BUILD
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} 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 add_custom_command(TARGET ${SHARED_LIB} POST_BUILD
COMMAND mkdir ARGS -p ${CMAKE_SOURCE_DIR}/Source/Android/app/src/main/assets/ COMMAND mkdir ARGS -p ${CMAKE_SOURCE_DIR}/Source/Android/app/src/main/assets/
) )
add_custom_command(TARGET ${DOLPHIN_EXE} POST_BUILD add_custom_command(TARGET ${SHARED_LIB} 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}/ 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 ${DOLPHIN_EXE} POST_BUILD 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/ 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 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/ 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}) set(CPACK_PACKAGE_EXECUTABLES ${CPACK_PACKAGE_EXECUTABLES} ${SHARED_LIB})
endif()

4
Source/CMakeLists.txt
View File

@ -47,7 +47,9 @@ macro(add_dolphin_library lib srcs libs)
endmacro(add_dolphin_library) endmacro(add_dolphin_library)
add_subdirectory(Core) add_subdirectory(Core)
add_subdirectory(Android/jni) if (ANDROID)
add_subdirectory(Android/jni)
endif()
add_subdirectory(UnitTests) add_subdirectory(UnitTests)
if (DSPTOOL) if (DSPTOOL)