Delta Between Two Patch Sets: adblock-android-webviewapp/build.gradle
Issue 29812630:
Issue 6750 - Update libadblockplus dependency to revision hg:4f6413dbcf2e (Closed)
Left Patch Set: Updated Android.mk because of different dirs per prebuilt libs.
Created June 21, 2018, 6:53 p.m.
Right Patch Set: addressed Sergey comments.
Created June 22, 2018, 11:18 a.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with change/comment
|
« adblock-android-webview/build.gradle ('k')
|
adblock-android/build.gradle » ('j')
|
no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| LEFT | RIGHT |
|---|---|
| (no file at all) | |
| 1 apply plugin: 'com.android.application' | 1 apply plugin: 'com.android.application' |
| 2 | 2 |
| 3 allprojects { | 3 allprojects { |
| 4 repositories { | 4 repositories { |
| 5 mavenLocal() | 5 mavenLocal() |
| 6 mavenCentral() | 6 mavenCentral() |
| 7 } | 7 } |
| 8 } | 8 } |
| 9 | 9 |
| 10 repositories { | 10 repositories { |
| 11 mavenLocal() | 11 mavenLocal() |
| 12 mavenCentral() | 12 mavenCentral() |
| 13 } | 13 } |
| 14 | 14 |
| 15 android { | 15 android { |
| 16 compileSdkVersion 21 | 16 compileSdkVersion 21 |
| 17 buildToolsVersion "25.0.0" | 17 buildToolsVersion "25.0.0" |
| 18 | 18 |
| 19 defaultConfig { | 19 defaultConfig { |
| 20 applicationId "org.adblockplus.libadblockplus.android.webviewapp" | 20 applicationId "org.adblockplus.libadblockplus.android.webviewapp" |
| 21 minSdkVersion 21 | 21 minSdkVersion 21 |
| 22 targetSdkVersion 21 | 22 targetSdkVersion 21 |
| 23 versionCode 9 | 23 versionCode 10 |
| 24 versionName "2.5" | 24 versionName "3.0" |
| 25 } | 25 } |
| 26 | 26 |
| 27 sourceSets { | 27 sourceSets { |
| 28 main { | 28 main { |
| 29 manifest.srcFile 'AndroidManifest.xml' | 29 manifest.srcFile 'AndroidManifest.xml' |
| 30 java.srcDirs = ['src'] | 30 java.srcDirs = ['src'] |
| 31 resources.srcDirs = ['src'] | 31 resources.srcDirs = ['src'] |
| 32 res.srcDirs = ['res'] | 32 res.srcDirs = ['res'] |
| 33 | 33 |
| 34 jni { | 34 jni { |
| 35 dependencies { | 35 dependencies { |
| 36 project ":adblock-android" | 36 project ":adblock-android" |
| 37 } | 37 } |
| 38 } | 38 } |
| 39 } | 39 } |
| 40 } | 40 } |
| 41 } | 41 } |
| 42 | 42 |
| 43 dependencies { | 43 dependencies { |
| 44 compile project(':adblock-android-settings') | 44 compile project(':adblock-android-settings') |
| 45 compile project(':adblock-android-webview') | 45 compile project(':adblock-android-webview') |
| 46 compile 'com.android.support:appcompat-v7:21.0.3' | 46 compile 'com.android.support:appcompat-v7:21.0.3' |
| 47 } | 47 } |
| LEFT | RIGHT |
« adblock-android-webview/build.gradle ('k')
|
adblock-android/build.gradle » ('j')
|
Toggle Intra-line Diffs ('i')
|
Expand Comments ('e')
|
Collapse Comments ('c')
|
Toggle Comments ('s')
