Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Delta Between Two Patch Sets: adblock-android/build.gradle

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

Powered by Google App Engine
This is Rietveld