DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-mastertemp_140451723

Bug: 134405016
Change-Id: Ia823681c5104d6b1986330db6205eebb5af3f307

1 files changed, 12 insertions, 6 deletions

diff --git a/library/build.gradle b/library/build.gradle
index 1f17008..fe707f0 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -55,15 +55,21 @@ android {
             manifest.srcFile 'AndroidManifest.xml'
         }
     }
+}
+
+android.libraryVariants.all { variant ->
+    variant.getJavaCompiler().dependsOn(makeVersionFile)
 
-    lintOptions {
-        // TODO: fix errors and reenable.
-        abortOnError false
+    if (!name.equals(com.android.builder.core.BuilderConstants.RELEASE)) {
+        return // Skip non-release
     }
-}
 
-android.libraryVariants.all {
-    v -> v.getJavaCompiler().dependsOn(makeVersionFile)
+
+    def sourceJar = project.tasks.create(name: "sourceJarRelease", type: Jar) {
+        classifier = 'sources'
+        from android.sourceSets.main.java.srcDirs
+    }
+    artifacts.add("archives", sourceJar)
 }
 
 uploadArchives {