| OLD | NEW | 
|   1 apply plugin: 'com.android.model.library' |   1 apply plugin: 'com.android.library' | 
|   2  |   2  | 
|   3 model { |   3 android { | 
 |   4   compileSdkVersion 16 | 
 |   5   buildToolsVersion "24.0.1" | 
|   4  |   6  | 
|   5   repositories { |   7   defaultConfig { | 
|   6     libs(PrebuiltLibraries) { |   8     minSdkVersion 9 | 
|   7       libadblockplus { |   9     targetSdkVersion 16 | 
|   8         headers.srcDir 'jni/libadblockplus-binaries/include/' |  10     versionCode 1 | 
|   9         binaries.withType(SharedLibraryBinary) { |  11     versionName "1.0" | 
|  10           sharedLibraryFile = file("jni/libadblockplus-binaries/android_${target
    Platform.getName()}/libadblockplus.a") |  | 
|  11         } |  | 
|  12       } |  | 
|  13  |  12  | 
|  14       v8_base { |  13     ndk { | 
|  15         headers.srcDir 'jni/libadblockplus-binaries/include/' |  14       abiFilters 'armeabi-v7a', 'x86' | 
|  16         binaries.withType(SharedLibraryBinary) { |  | 
|  17           sharedLibraryFile = file("jni/libadblockplus-binaries/android_${target
    Platform.getName()}/libv8_base.a") |  | 
|  18         } |  | 
|  19       } |  | 
|  20  |  | 
|  21       v8_snapshot { |  | 
|  22         headers.srcDir 'jni/libadblockplus-binaries/include/' |  | 
|  23         binaries.withType(SharedLibraryBinary) { |  | 
|  24           sharedLibraryFile = file("jni/libadblockplus-binaries/android_${target
    Platform.getName()}/libv8_snapshot.a") |  | 
|  25         } |  | 
|  26       } |  | 
|  27     } |  15     } | 
|  28   } |  16   } | 
|  29  |  17  | 
|  30   android { |  18   externalNativeBuild { | 
|  31     compileSdkVersion 16 |  19     ndkBuild { | 
|  32     buildToolsVersion "22.0.1" |  20       path 'jni/Android.mk' | 
 |  21     } | 
 |  22   } | 
|  33  |  23  | 
|  34     ndk { |  24   sourceSets { | 
|  35       moduleName = "adblockplus-jni" |  25     main { | 
|  36       cppFlags.add("-std=c++11") |  26       manifest.srcFile 'AndroidManifest.xml' | 
|  37       cppFlags.add("-fexceptions") |  27       java.srcDirs = ['src'] | 
|  38       stl = "c++_static" |  28       res.srcDirs = ['res'] | 
|  39  |  29       jni.srcDirs = ['jni'] | 
|  40       abiFilters.addAll(['armeabi-v7a', 'x86']) // supported abis only |  | 
|  41     } |  | 
|  42  |  | 
|  43     defaultConfig { |  | 
|  44       minSdkVersion.apiLevel 9 |  | 
|  45       targetSdkVersion.apiLevel 16 |  | 
|  46       versionCode 359 |  | 
|  47       versionName "1.3" |  | 
|  48     } |  | 
|  49  |  | 
|  50     sources { |  | 
|  51       main { |  | 
|  52         manifest { |  | 
|  53           source { |  | 
|  54             srcDir '.' |  | 
|  55             include 'AndroidManifest.xml' |  | 
|  56           } |  | 
|  57         } |  | 
|  58         java { source { srcDirs = ['src'] } } |  | 
|  59         resources { source { srcDirs = ['src'] } } |  | 
|  60         res { source { srcDirs = ['res'] } } |  | 
|  61         jni { |  | 
|  62           source { srcDirs = ['jni'] } |  | 
|  63           dependencies { |  | 
|  64             library "libadblockplus" |  | 
|  65             library "v8_base" |  | 
|  66             library "v8_snapshot" |  | 
|  67           } |  | 
|  68         } |  | 
|  69       } |  | 
|  70     } |  30     } | 
|  71   } |  31   } | 
|  72 } |  32 } | 
| OLD | NEW |