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

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

Issue 29557565: Issue 5800 - Add option to specify a list of V8 libraries (Closed)
Left Patch Set: Excluding v8 shared libs from AAR (Gradle) Created Oct. 12, 2017, 12:27 p.m.
Right Patch Set: moved 'packagingOptions' section to dynamic linking 'if' branch only Created Nov. 2, 2017, 11:30 a.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
« no previous file with change/comment | « README.md ('k') | libadblockplus-android/jni/Android.mk » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
1 apply plugin: 'com.android.library' 1 apply plugin: 'com.android.library'
2 2
3 android { 3 android {
4 compileSdkVersion 16 4 compileSdkVersion 16
5 buildToolsVersion "25.0.0" 5 buildToolsVersion "25.0.0"
6 6
7 defaultConfig { 7 defaultConfig {
8 minSdkVersion 11 8 minSdkVersion 11
9 targetSdkVersion 16 9 targetSdkVersion 16
10 versionCode 1 10 versionCode 1
(...skipping 12 matching lines...) Expand all
23 23
24 sourceSets { 24 sourceSets {
25 main { 25 main {
26 manifest.srcFile 'AndroidManifest.xml' 26 manifest.srcFile 'AndroidManifest.xml'
27 java.srcDirs = ['src'] 27 java.srcDirs = ['src']
28 res.srcDirs = ['res'] 28 res.srcDirs = ['res']
29 jni.srcDirs = ['jni'] 29 jni.srcDirs = ['jni']
30 } 30 }
31 } 31 }
32 32
33 def sharedV8LibFilesSet = []
34 def sharedV8LibFiles = System.getenv('SHARED_V8_LIB_FILENAMES') 33 def sharedV8LibFiles = System.getenv('SHARED_V8_LIB_FILENAMES')
35 if (sharedV8LibFiles != null) { 34 if (sharedV8LibFiles != null) {
35 def sharedV8LibFilesSet = []
36 def sharedV8LibFilesArray = sharedV8LibFiles.split(' ') 36 def sharedV8LibFilesArray = sharedV8LibFiles.split(' ')
37 sharedV8LibFilesArray.each { eachFileName -> 37 sharedV8LibFilesArray.each { eachFileName ->
38 sharedV8LibFilesSet.add("**/" + eachFileName) 38 sharedV8LibFilesSet.add("**/" + eachFileName)
39 println "[Configuration] Excluding shared v8 library " + eachFileName + " from AAR" 39 println "[Configuration] Excluding shared v8 library " + eachFileName + " from AAR"
40 } 40 }
41
42 packagingOptions {
43 excludes = sharedV8LibFilesSet
diegocarloslima 2017/11/08 13:25:55 I think we weren't in the same page in my last com
anton 2017/11/08 13:28:25 It's equal to what we had before last patch set. I
44 }
41 } else { 45 } else {
42 println "[Configuration] No shared v8 libraries excluded from AAR" 46 println "[Configuration] No shared v8 libraries excluded from AAR"
43 } 47 }
44 48
45 packagingOptions {
46 excludes = sharedV8LibFilesSet
diegocarloslima 2017/10/16 10:04:28 I just think that instead of using the sharedV8Lib
47 }
48 } 49 }
LEFTRIGHT

Powered by Google App Engine
This is Rietveld