diff options
author | Justin Klaassen <justinklaassen@google.com> | 2014-07-21 19:54:02 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-07-21 19:54:02 +0000 |
commit | 73513fb9babbf8efbff930cb4cc81acdb1f1fdf3 (patch) | |
tree | de8cbe05a58659f045058ed1010d33494ee9ee75 | |
parent | 366ddf74b427109ff2470aa468da2fe5bf1ab5d1 (diff) | |
parent | b50ab0c2167956317e7fc2358e87320991418cf5 (diff) | |
download | android_frameworks_ex-73513fb9babbf8efbff930cb4cc81acdb1f1fdf3.tar.gz android_frameworks_ex-73513fb9babbf8efbff930cb4cc81acdb1f1fdf3.tar.bz2 android_frameworks_ex-73513fb9babbf8efbff930cb4cc81acdb1f1fdf3.zip |
am b50ab0c2: am 3fbecf11: Update build.gradle from master
* commit 'b50ab0c2167956317e7fc2358e87320991418cf5':
Update build.gradle from master
-rw-r--r-- | common/build.gradle | 37 |
1 files changed, 9 insertions, 28 deletions
diff --git a/common/build.gradle b/common/build.gradle index d2612c5..258bee6 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -1,36 +1,17 @@ apply plugin: 'android-library' - -buildDir = "$project.rootBuildDir/android-$project.name" +apply plugin: 'logtags' android { - compileSdkVersion 17 - buildToolsVersion = 17 - - logtags { - srcDirs = ['java'] - genDir = "$buildDir/source/generated" - } - sourceSets { main { - manifest { - srcFile "AndroidManifest.xml" - } - java { - srcDirs = [ - 'java', - "$buildDir/source/generated" - ] - } - resources.srcDirs = ['src'] - aidl.srcDirs = ['src'] - renderscript.srcDirs = ['src'] - res.srcDirs = ['res'] - assets.srcDirs = ['assets'] + manifest.srcFile 'AndroidManifest.xml' + java.srcDirs = ['java'] + logtags.srcDirs = ['java'] } } -} -android.libraryVariants.each { variant -> - variant.packageLibrary.baseName = "android-common" -}
\ No newline at end of file + lintOptions { + // TODO: fix errors and reenable. + abortOnError false + } +} |