summaryrefslogtreecommitdiff
path: root/Source/Core
diff options
context:
space:
mode:
authorEder Bastos <bastos.eder@gmail.com>2015-05-05 22:34:56 -0400
committerEder Bastos <bastos.eder@gmail.com>2015-05-05 22:34:56 -0400
commit2fe4b9ce68ad3f787b43cee3a9bf178196ff112a (patch)
tree7f23072f645593582d37c45558ba7ee5b5f33ee5 /Source/Core
parent6414cdabb2ae7762f2d98427b9ff024af07bb959 (diff)
Remove the "nativeLibsToJar" gradle task.
Diffstat (limited to 'Source/Core')
-rw-r--r--Source/Core/DolphinWX/CMakeLists.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/Core/DolphinWX/CMakeLists.txt b/Source/Core/DolphinWX/CMakeLists.txt
index ab8b5db4cd..275a68f426 100644
--- a/Source/Core/DolphinWX/CMakeLists.txt
+++ b/Source/Core/DolphinWX/CMakeLists.txt
@@ -117,13 +117,13 @@ if(ANDROID)
"-Wl,--no-whole-archive"
)
add_custom_command(TARGET ${DOLPHIN_EXE} POST_BUILD
- COMMAND mkdir ARGS -p ${CMAKE_SOURCE_DIR}/Source/Android/app/libs/${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
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/libs/${ANDROID_NDK_ABI_NAME}/
+ 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/