| OLD | NEW |
| 1 apply plugin: 'com.android.library' | 1 apply plugin: 'com.android.library' |
| 2 apply plugin: 'com.novoda.bintray-release' |
| 2 | 3 |
| 3 android { | 4 android { |
| 4 compileSdkVersion 16 | 5 compileSdkVersion 16 |
| 5 buildToolsVersion "25.0.0" | 6 buildToolsVersion '27.0.3' |
| 6 | 7 |
| 7 defaultConfig { | 8 defaultConfig { |
| 8 minSdkVersion 16 | 9 minSdkVersion 16 |
| 9 targetSdkVersion 16 | 10 targetSdkVersion 16 |
| 10 versionCode 6 | |
| 11 versionName "3.0" | |
| 12 } | 11 } |
| 13 | 12 |
| 14 publishNonDefault true | 13 flavorDimensions "abi" |
| 15 | 14 |
| 16 productFlavors { | 15 productFlavors { |
| 17 abi_arm { | 16 abi_arm { |
| 17 dimension = "abi" |
| 18 ndk { | 18 ndk { |
| 19 abiFilters "armeabi-v7a" | 19 abiFilters "armeabi-v7a" |
| 20 } | 20 } |
| 21 | 21 |
| 22 externalNativeBuild { | 22 externalNativeBuild { |
| 23 ndkBuild { | 23 ndkBuild { |
| 24 arguments "APP_ABI=armeabi-v7a" | 24 arguments "APP_ABI=armeabi-v7a" |
| 25 } | 25 } |
| 26 } | 26 } |
| 27 } | 27 } |
| 28 | 28 |
| 29 abi_x86 { | 29 abi_x86 { |
| 30 dimension = "abi" |
| 30 ndk { | 31 ndk { |
| 31 abiFilters "x86" | 32 abiFilters "x86" |
| 32 } | 33 } |
| 33 | 34 |
| 34 externalNativeBuild { | 35 externalNativeBuild { |
| 35 ndkBuild { | 36 ndkBuild { |
| 36 arguments "APP_ABI=x86" | 37 arguments "APP_ABI=x86" |
| 37 } | 38 } |
| 38 } | 39 } |
| 39 } | 40 } |
| 40 | 41 |
| 41 abi_all { | 42 abi_all { |
| 43 dimension = "abi" |
| 42 ndk { | 44 ndk { |
| 43 abiFilters 'armeabi-v7a', 'x86' | 45 abiFilters 'armeabi-v7a', 'x86' |
| 44 } | 46 } |
| 45 } | 47 } |
| 46 } | 48 } |
| 47 | 49 |
| 48 externalNativeBuild { | 50 externalNativeBuild { |
| 49 ndkBuild { | 51 ndkBuild { |
| 50 path 'jni/Android.mk' | 52 path 'jni/Android.mk' |
| 51 } | 53 } |
| 52 } | 54 } |
| 53 | 55 |
| 54 sourceSets { | 56 sourceSets { |
| 55 main { | 57 main { |
| 56 manifest.srcFile 'AndroidManifest.xml' | 58 manifest.srcFile 'AndroidManifest.xml' |
| 57 java.srcDirs = ['src'] | 59 java.srcDirs = ['src'] |
| 58 res.srcDirs = ['res'] | 60 res.srcDirs = ['res'] |
| 59 jni.srcDirs = ['jni'] | 61 jni.srcDirs = ['jni'] |
| 60 } | 62 } |
| 61 } | 63 } |
| 62 | 64 |
| 65 publish { |
| 66 userOrg = rootProject.ext.bintrayUserOrg |
| 67 groupId = rootProject.ext.bintrayGroupId |
| 68 artifactId = 'adblock-android' |
| 69 publishVersion = '3.0' |
| 70 licences = rootProject.ext.bintrayLicences |
| 71 desc = 'An Android library that provides the core functionality of Adblock P
lus.' |
| 72 website = rootProject.ext.bintrayWebsite |
| 73 issueTracker = rootProject.ext.bintrayIssueTracker |
| 74 repository = rootProject.ext.bintrayRepository |
| 75 publications = ['abi_allRelease'] |
| 76 } |
| 77 |
| 63 def sharedV8LibFiles = System.getenv('SHARED_V8_LIB_FILENAMES') | 78 def sharedV8LibFiles = System.getenv('SHARED_V8_LIB_FILENAMES') |
| 64 if (sharedV8LibFiles != null) { | 79 if (sharedV8LibFiles != null) { |
| 65 def sharedV8LibFilesSet = [] | 80 def sharedV8LibFilesSet = [] |
| 66 def sharedV8LibFilesArray = sharedV8LibFiles.split(' ') | 81 def sharedV8LibFilesArray = sharedV8LibFiles.split(' ') |
| 67 sharedV8LibFilesArray.each { eachFileName -> | 82 sharedV8LibFilesArray.each { eachFileName -> |
| 68 sharedV8LibFilesSet.add("**/" + eachFileName) | 83 sharedV8LibFilesSet.add("**/" + eachFileName) |
| 69 println "[Configuration] Excluding shared v8 library " + eachFileName + "
from AAR" | 84 println "[Configuration] Excluding shared v8 library " + eachFileName + "
from AAR" |
| 70 } | 85 } |
| 71 | 86 |
| 72 packagingOptions { | 87 packagingOptions { |
| 73 excludes = sharedV8LibFilesSet | 88 excludes = sharedV8LibFilesSet |
| 74 } | 89 } |
| 75 } else { | 90 } else { |
| 76 println "[Configuration] No shared v8 libraries excluded from AAR" | 91 println "[Configuration] No shared v8 libraries excluded from AAR" |
| 77 } | 92 } |
| 78 | 93 |
| 79 } | 94 } |
| OLD | NEW |