commit 9697da770746866fc0152643e8eacb17a4c5af88
author Aurimas Liutikas <aurimas@google.com> Thu Dec 22 15:50:42 2016 -0800
committer Aurimas Liutikas <aurimas@google.com> Tue Jan 03 13:02:24 2017 -0800
tree a7a370ff4169f477d365ac36f713db24ffe7a930
parent 78df598110a20553ebc7d394ac243bcfc860d1f2

Create AndroidLibraryPlugin to share common module configuration.

First step in cleaning up duplicate code in build.gradle config files.

This CL relands ag/1746409 that had to be reverted due to not listing all the maven
repositories in buildSrc/build.gradle.

Bug: 33845666
Test: ./gradlew clean assemble assembleAndroidTest continues to work
Change-Id: I335c4366a015efa7eab880cd8d01659c41f1abb2

v17/leanback/build.gradle

diff --git a/v17/leanback/build.gradle b/v17/leanback/build.gradle
index 9ed65a8..b9b17bc 100644
--- a/v17/leanback/build.gradle
+++ b/v17/leanback/build.gradle
@@ -1,4 +1,4 @@
-apply plugin: 'com.android.library'
+apply plugin: android.support.SupportLibraryPlugin
 archivesBaseName = 'leanback-v17'
 
 dependencies {
@@ -24,11 +24,9 @@
 
     defaultConfig {
         minSdkVersion 17
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
 
     sourceSets {
-        main.manifest.srcFile 'AndroidManifest.xml'
         main.java.srcDirs = [
                 'common',
                 'jbmr2',
@@ -38,22 +36,12 @@
                 'src'
         ]
         main.res.srcDir 'res'
-
-        androidTest.setRoot('tests')
-        androidTest.java.srcDir 'tests/java'
-        androidTest.res.srcDir 'tests/res'
-        androidTest.manifest.srcFile 'tests/AndroidManifest.xml'
     }
 
     lintOptions {
         // Remove this once all NewApi breakages have been fixed.
         disable "NewApi"
     }
-
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
-    }
 }
 
 android.libraryVariants.all { variant ->

v17/preference-leanback/build.gradle

diff --git a/v17/preference-leanback/build.gradle b/v17/preference-leanback/build.gradle
index e58fa8b..2400168 100644
--- a/v17/preference-leanback/build.gradle
+++ b/v17/preference-leanback/build.gradle
@@ -1,4 +1,4 @@
-apply plugin: 'com.android.library'
+apply plugin: android.support.SupportLibraryPlugin
 archivesBaseName = 'preference-leanback-v17'
 
 dependencies {
@@ -13,19 +13,17 @@
 android {
     compileSdkVersion project.ext.currentSdk
 
+    defaultConfig {
+        minSdkVersion 17
+    }
+
     sourceSets {
-        main.manifest.srcFile 'AndroidManifest.xml'
         main.java.srcDirs = [
                 'api21',
                 'src'
         ]
         main.res.srcDir 'res'
     }
-
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
-    }
 }
 
 android.libraryVariants.all { variant ->