Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(111)

Side by Side Diff: customtabs/build.gradle

Issue 1561983002: Fix dependency errors in Android Studio (Closed) Base URL: https://github.com/GoogleChrome/custom-tabs-client.git@master
Patch Set: Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « customtabs/AndroidManifest.xml ('k') | shared/build.gradle » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 apply plugin: 'android-library' 1 apply plugin: 'android-library'
2 2
3 dependencies { 3 dependencies {
4 compile "com.android.support:support-annotations:22.2.0+" 4 compile 'com.android.support:support-annotations:22.2.0+'
5 compile 'com.android.support:support-v4:23.1.1'
5 } 6 }
6 7
7 android { 8 android {
8 compileSdkVersion 23 9 compileSdkVersion 23
9 buildToolsVersion "23.0.1" 10 buildToolsVersion "23.0.1"
10 11
11 sourceSets { 12 sourceSets {
12 main.manifest.srcFile 'AndroidManifest.xml' 13 main.manifest.srcFile 'AndroidManifest.xml'
13 main.java.srcDirs = ['src'] 14 main.java.srcDirs = ['src']
14 main.aidl.srcDirs = ['src'] 15 main.aidl.srcDirs = ['src']
15 main.res.srcDir 'res' 16 main.res.srcDir 'res'
16 main.assets.srcDir 'assets' 17 main.assets.srcDir 'assets'
17 main.resources.srcDir 'java' 18 main.resources.srcDir 'java'
18 19
19 androidTest.setRoot('tests') 20 androidTest.setRoot('tests')
20 androidTest.java.srcDir('tests/src/') 21 androidTest.java.srcDir('tests/src/')
21 } 22 }
22 23
23 compileOptions { 24 compileOptions {
24 sourceCompatibility JavaVersion.VERSION_1_7 25 sourceCompatibility JavaVersion.VERSION_1_7
25 targetCompatibility JavaVersion.VERSION_1_7 26 targetCompatibility JavaVersion.VERSION_1_7
26 } 27 }
27 } 28 }
OLDNEW
« no previous file with comments | « customtabs/AndroidManifest.xml ('k') | shared/build.gradle » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698