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