Update build.gradle from master

Change-Id: I858554625d69dbc34f7174a5c8526d602113b569

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
+    }
+}