| Index: libadblockplus-android/build.gradle |
| diff --git a/libadblockplus-android/build.gradle b/libadblockplus-android/build.gradle |
| index 9cfcb2d04d18c4efd2519c12f83b9b9147a157c3..ec3bae60b5fd3122d7313fe2a89aab06429252af 100644 |
| --- a/libadblockplus-android/build.gradle |
| +++ b/libadblockplus-android/build.gradle |
| @@ -1,72 +1,32 @@ |
| -apply plugin: 'com.android.model.library' |
| +apply plugin: 'com.android.library' |
| -model { |
| +android { |
| + compileSdkVersion 16 |
| + buildToolsVersion "24.0.1" |
| - repositories { |
| - libs(PrebuiltLibraries) { |
| - libadblockplus { |
| - headers.srcDir 'jni/libadblockplus-binaries/include/' |
| - binaries.withType(SharedLibraryBinary) { |
| - sharedLibraryFile = file("jni/libadblockplus-binaries/android_${targetPlatform.getName()}/libadblockplus.a") |
| - } |
| - } |
| - |
| - v8_base { |
| - headers.srcDir 'jni/libadblockplus-binaries/include/' |
| - binaries.withType(SharedLibraryBinary) { |
| - sharedLibraryFile = file("jni/libadblockplus-binaries/android_${targetPlatform.getName()}/libv8_base.a") |
| - } |
| - } |
| - |
| - v8_snapshot { |
| - headers.srcDir 'jni/libadblockplus-binaries/include/' |
| - binaries.withType(SharedLibraryBinary) { |
| - sharedLibraryFile = file("jni/libadblockplus-binaries/android_${targetPlatform.getName()}/libv8_snapshot.a") |
| - } |
| - } |
| - } |
| - } |
| - |
| - android { |
| - compileSdkVersion 16 |
| - buildToolsVersion "22.0.1" |
| + defaultConfig { |
| + minSdkVersion 9 |
| + targetSdkVersion 16 |
| + versionCode 1 |
| + versionName "1.0" |
| ndk { |
| - moduleName = "adblockplus-jni" |
| - cppFlags.add("-std=c++11") |
| - cppFlags.add("-fexceptions") |
| - stl = "c++_static" |
| - |
| - abiFilters.addAll(['armeabi-v7a', 'x86']) // supported abis only |
| + abiFilters 'armeabi-v7a', 'x86' |
| } |
| + } |
| - defaultConfig { |
| - minSdkVersion.apiLevel 9 |
| - targetSdkVersion.apiLevel 16 |
| - versionCode 359 |
| - versionName "1.3" |
| + externalNativeBuild { |
| + ndkBuild { |
| + path 'jni/Android.mk' |
| } |
| + } |
| - sources { |
| - main { |
| - manifest { |
| - source { |
| - srcDir '.' |
| - include 'AndroidManifest.xml' |
| - } |
| - } |
| - java { source { srcDirs = ['src'] } } |
| - resources { source { srcDirs = ['src'] } } |
| - res { source { srcDirs = ['res'] } } |
| - jni { |
| - source { srcDirs = ['jni'] } |
| - dependencies { |
| - library "libadblockplus" |
| - library "v8_base" |
| - library "v8_snapshot" |
| - } |
| - } |
| - } |
| + sourceSets { |
| + main { |
| + manifest.srcFile 'AndroidManifest.xml' |
| + java.srcDirs = ['src'] |
| + res.srcDirs = ['res'] |
| + jni.srcDirs = ['jni'] |
| } |
| } |
| } |