From d99336fc44a5e1e542b5b77e9305f6d2c2d94b27 Mon Sep 17 00:00:00 2001 From: msdx <645079761@qq.com> Date: Sat, 20 Jun 2015 13:56:17 +0800 Subject: [PATCH] Convention over configuration. So I moved the .so files to app/src/main/jniLibs directory. --- app/build.gradle | 16 ---------------- .../main/jniLibs}/armeabi-v7a/libbypass.so | Bin .../main/jniLibs}/armeabi/libbypass.so | Bin .../main/jniLibs}/mips/libbypass.so | Bin .../main/jniLibs}/x86/libbypass.so | Bin 5 files changed, 16 deletions(-) rename app/{native-libs => src/main/jniLibs}/armeabi-v7a/libbypass.so (100%) rename app/{native-libs => src/main/jniLibs}/armeabi/libbypass.so (100%) rename app/{native-libs => src/main/jniLibs}/mips/libbypass.so (100%) rename app/{native-libs => src/main/jniLibs}/x86/libbypass.so (100%) diff --git a/app/build.gradle b/app/build.gradle index c1db2b9..26a4e13 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,5 +1,3 @@ -import com.android.build.gradle.tasks.PackageApplication - apply plugin: 'android' apply from: 'signing.gradle' @@ -44,17 +42,3 @@ dependencies { compile 'com.android.support:appcompat-v7:21.0.0' compile fileTree(dir: 'libs', include: ['*.jar']) } - -task copyNativeLibs(type: Copy) { - from(new File(getProjectDir(), 'native-libs')) { include '**/*.so' } - into new File(buildDir, 'native-libs') -} - -tasks.withType(Compile) { compileTask -> compileTask.dependsOn copyNativeLibs } - -clean.dependsOn 'cleanCopyNativeLibs' - -tasks.withType(PackageApplication) { pkgTask -> - pkgTask.jniFolders = new HashSet() - pkgTask.jniFolders.add(new File(buildDir, 'native-libs')) -} \ No newline at end of file diff --git a/app/native-libs/armeabi-v7a/libbypass.so b/app/src/main/jniLibs/armeabi-v7a/libbypass.so similarity index 100% rename from app/native-libs/armeabi-v7a/libbypass.so rename to app/src/main/jniLibs/armeabi-v7a/libbypass.so diff --git a/app/native-libs/armeabi/libbypass.so b/app/src/main/jniLibs/armeabi/libbypass.so similarity index 100% rename from app/native-libs/armeabi/libbypass.so rename to app/src/main/jniLibs/armeabi/libbypass.so diff --git a/app/native-libs/mips/libbypass.so b/app/src/main/jniLibs/mips/libbypass.so similarity index 100% rename from app/native-libs/mips/libbypass.so rename to app/src/main/jniLibs/mips/libbypass.so diff --git a/app/native-libs/x86/libbypass.so b/app/src/main/jniLibs/x86/libbypass.so similarity index 100% rename from app/native-libs/x86/libbypass.so rename to app/src/main/jniLibs/x86/libbypass.so