diff options
| author | Eder Bastos <bastos.eder@gmail.com> | 2015-05-05 22:34:56 -0400 |
|---|---|---|
| committer | Eder Bastos <bastos.eder@gmail.com> | 2015-05-05 22:34:56 -0400 |
| commit | 2fe4b9ce68ad3f787b43cee3a9bf178196ff112a (patch) | |
| tree | 7f23072f645593582d37c45558ba7ee5b5f33ee5 /Source | |
| parent | 6414cdabb2ae7762f2d98427b9ff024af07bb959 (diff) | |
Remove the "nativeLibsToJar" gradle task.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Android/app/build.gradle | 15 | ||||
| -rw-r--r-- | Source/Core/DolphinWX/CMakeLists.txt | 4 |
2 files changed, 2 insertions, 17 deletions
diff --git a/Source/Android/app/build.gradle b/Source/Android/app/build.gradle index 03a24f4f19..50ec628d1d 100644 --- a/Source/Android/app/build.gradle +++ b/Source/Android/app/build.gradle @@ -4,18 +4,6 @@ android { compileSdkVersion 21 buildToolsVersion "20.0.0" - task nativeLibsToJar(type: Zip, description: 'create a jar archive of the native libs') { - destinationDir file("$buildDir/native-libs") - baseName 'native-libs' - extension 'jar' - from fileTree(dir: 'libs', include: '**/*.so') - into 'lib/' - } - - tasks.withType(JavaCompile) { - compileTask -> compileTask.dependsOn(nativeLibsToJar) - } - lintOptions { // This is important as it will run lint but not abort on error // Lint has some overly obnoxious "errors" that should really be warnings @@ -30,7 +18,6 @@ android { versionName "0.13" } - signingConfigs { release { if (project.hasProperty('keystore')) { @@ -59,8 +46,6 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - compile fileTree(dir: "$buildDir/native-libs", include: 'native-libs.jar') compile 'com.android.support:support-v4:22.0.0' compile 'com.android.support:support-v13:22.0.0' 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/ |