Unify all temp local repo.

Also stop putting all dependencies inside the
builder artifact, and instead let it depend on
other artifacts.

Change-Id: I0f3adb2883ac9f34dc82bff420964243487e09a4

28 files changed, 28 insertions, 84 deletions

diff --git a/tests/aidl/build.gradle b/tests/aidl/build.gradle
index 9b46579..e632dbf 100644
--- a/tests/aidl/build.gradle
+++ b/tests/aidl/build.gradle
@@ -1,8 +1,6 @@
 buildscript {
     repositories {
-        maven { url '../../repo' }
-        maven { url '../../../../prebuilts/tools/common/m2/repository' }
-        maven { url '../../../../prebuilts/tools/common/m2/internal' }
+        maven { url '../../../../out/host/gradle/repo' }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:0.4-SNAPSHOT'
diff --git a/tests/api/build.gradle b/tests/api/build.gradle
index 7981280..e12126d 100644
--- a/tests/api/build.gradle
+++ b/tests/api/build.gradle
@@ -1,8 +1,6 @@
 buildscript {
     repositories {
-        maven { url '../../repo' }
-        maven { url '../../../../prebuilts/tools/common/m2/repository' }
-        maven { url '../../../../prebuilts/tools/common/m2/internal' }
+        maven { url '../../../../out/host/gradle/repo' }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:0.4-SNAPSHOT'
diff --git a/tests/applibtest/build.gradle b/tests/applibtest/build.gradle
index 7981280..e12126d 100644
--- a/tests/applibtest/build.gradle
+++ b/tests/applibtest/build.gradle
@@ -1,8 +1,6 @@
 buildscript {
     repositories {
-        maven { url '../../repo' }
-        maven { url '../../../../prebuilts/tools/common/m2/repository' }
-        maven { url '../../../../prebuilts/tools/common/m2/internal' }
+        maven { url '../../../../out/host/gradle/repo' }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:0.4-SNAPSHOT'
diff --git a/tests/assets/build.gradle b/tests/assets/build.gradle
index 2fe645b..f32a1e4 100644
--- a/tests/assets/build.gradle
+++ b/tests/assets/build.gradle
@@ -1,8 +1,6 @@
 buildscript {
     repositories {
-        maven { url '../../repo' }
-        maven { url '../../../../prebuilts/tools/common/m2/repository' }
-        maven { url '../../../../prebuilts/tools/common/m2/internal' }
+        maven { url '../../../../out/host/gradle/repo' }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:0.4-SNAPSHOT'
diff --git a/tests/attrOrder/build.gradle b/tests/attrOrder/build.gradle
index 7981280..e12126d 100644
--- a/tests/attrOrder/build.gradle
+++ b/tests/attrOrder/build.gradle
@@ -1,8 +1,6 @@
 buildscript {
     repositories {
-        maven { url '../../repo' }
-        maven { url '../../../../prebuilts/tools/common/m2/repository' }
-        maven { url '../../../../prebuilts/tools/common/m2/internal' }
+        maven { url '../../../../out/host/gradle/repo' }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:0.4-SNAPSHOT'
diff --git a/tests/basic/build.gradle b/tests/basic/build.gradle
index 1ad3105..ca3602a 100644
--- a/tests/basic/build.gradle
+++ b/tests/basic/build.gradle
@@ -1,8 +1,6 @@
 buildscript {
     repositories {
-        maven { url '../../repo' }
-        maven { url '../../../../prebuilts/tools/common/m2/repository' }
-        maven { url '../../../../prebuilts/tools/common/m2/internal' }
+        maven { url '../../../../out/host/gradle/repo' }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:0.4-SNAPSHOT'
diff --git a/tests/dependencies/build.gradle b/tests/dependencies/build.gradle
index 775f904..6c7c3a5 100644
--- a/tests/dependencies/build.gradle
+++ b/tests/dependencies/build.gradle
@@ -1,8 +1,6 @@
 buildscript {
     repositories {
-        maven { url '../../repo' }
-        maven { url '../../../../prebuilts/tools/common/m2/repository' }
-        maven { url '../../../../prebuilts/tools/common/m2/internal' }
+        maven { url '../../../../out/host/gradle/repo' }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:0.4-SNAPSHOT'
diff --git a/tests/flavored/build.gradle b/tests/flavored/build.gradle
index 3785785..c8b0604 100644
--- a/tests/flavored/build.gradle
+++ b/tests/flavored/build.gradle
@@ -1,8 +1,6 @@
 buildscript {
     repositories {
-        maven { url '../../repo' }
-        maven { url '../../../../prebuilts/tools/common/m2/repository' }
-        maven { url '../../../../prebuilts/tools/common/m2/internal' }
+        maven { url '../../../../out/host/gradle/repo' }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:0.4-SNAPSHOT'
diff --git a/tests/flavorlib/build.gradle b/tests/flavorlib/build.gradle
index 2fe645b..f32a1e4 100644
--- a/tests/flavorlib/build.gradle
+++ b/tests/flavorlib/build.gradle
@@ -1,8 +1,6 @@
 buildscript {
     repositories {
-        maven { url '../../repo' }
-        maven { url '../../../../prebuilts/tools/common/m2/repository' }
-        maven { url '../../../../prebuilts/tools/common/m2/internal' }
+        maven { url '../../../../out/host/gradle/repo' }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:0.4-SNAPSHOT'
diff --git a/tests/flavorlibWithFailedTests/build.gradle b/tests/flavorlibWithFailedTests/build.gradle
index 2fe645b..f32a1e4 100644
--- a/tests/flavorlibWithFailedTests/build.gradle
+++ b/tests/flavorlibWithFailedTests/build.gradle
@@ -1,8 +1,6 @@
 buildscript {
     repositories {
-        maven { url '../../repo' }
-        maven { url '../../../../prebuilts/tools/common/m2/repository' }
-        maven { url '../../../../prebuilts/tools/common/m2/internal' }
+        maven { url '../../../../out/host/gradle/repo' }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:0.4-SNAPSHOT'
diff --git a/tests/flavors/build.gradle b/tests/flavors/build.gradle
index 3593d04..eaa0c6f 100644
--- a/tests/flavors/build.gradle
+++ b/tests/flavors/build.gradle
@@ -1,8 +1,6 @@
 buildscript {
     repositories {
-        maven { url '../../repo' }
-        maven { url '../../../../prebuilts/tools/common/m2/repository' }
-        maven { url '../../../../prebuilts/tools/common/m2/internal' }
+        maven { url '../../../../out/host/gradle/repo' }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:0.4-SNAPSHOT'
diff --git a/tests/libsTest/build.gradle b/tests/libsTest/build.gradle
index 2fe645b..f32a1e4 100644
--- a/tests/libsTest/build.gradle
+++ b/tests/libsTest/build.gradle
@@ -1,8 +1,6 @@
 buildscript {
     repositories {
-        maven { url '../../repo' }
-        maven { url '../../../../prebuilts/tools/common/m2/repository' }
-        maven { url '../../../../prebuilts/tools/common/m2/internal' }
+        maven { url '../../../../out/host/gradle/repo' }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:0.4-SNAPSHOT'
diff --git a/tests/localJars/build.gradle b/tests/localJars/build.gradle
index 573f6dc..56365b3 100644
--- a/tests/localJars/build.gradle
+++ b/tests/localJars/build.gradle
@@ -1,8 +1,6 @@
 buildscript {
     repositories {
-        maven { url '../../repo' }
-        maven { url '../../../../prebuilts/tools/common/m2/repository' }
-        maven { url '../../../../prebuilts/tools/common/m2/internal' }
+        maven { url '../../../../out/host/gradle/repo' }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:0.4-SNAPSHOT'
diff --git a/tests/migrated/build.gradle b/tests/migrated/build.gradle
index 3a09dd6..77b52d5 100644
--- a/tests/migrated/build.gradle
+++ b/tests/migrated/build.gradle
@@ -1,8 +1,6 @@
 buildscript {
     repositories {
-        maven { url '../../repo' }
-        maven { url '../../../../prebuilts/tools/common/m2/repository' }
-        maven { url '../../../../prebuilts/tools/common/m2/internal' }
+        maven { url '../../../../out/host/gradle/repo' }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:0.4-SNAPSHOT'
diff --git a/tests/multiproject/build.gradle b/tests/multiproject/build.gradle
index 573f6dc..56365b3 100644
--- a/tests/multiproject/build.gradle
+++ b/tests/multiproject/build.gradle
@@ -1,8 +1,6 @@
 buildscript {
     repositories {
-        maven { url '../../repo' }
-        maven { url '../../../../prebuilts/tools/common/m2/repository' }
-        maven { url '../../../../prebuilts/tools/common/m2/internal' }
+        maven { url '../../../../out/host/gradle/repo' }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:0.4-SNAPSHOT'
diff --git a/tests/multires/build.gradle b/tests/multires/build.gradle
index ce3dfd8..55b2528 100644
--- a/tests/multires/build.gradle
+++ b/tests/multires/build.gradle
@@ -1,8 +1,6 @@
 buildscript {
     repositories {
-        maven { url '../../repo' }
-        maven { url '../../../../prebuilts/tools/common/m2/repository' }
-        maven { url '../../../../prebuilts/tools/common/m2/internal' }
+        maven { url '../../../../out/host/gradle/repo' }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:0.4-SNAPSHOT'
diff --git a/tests/overlay1/build.gradle b/tests/overlay1/build.gradle
index 25a15a2..9cf7f91 100644
--- a/tests/overlay1/build.gradle
+++ b/tests/overlay1/build.gradle
@@ -1,8 +1,6 @@
 buildscript {
     repositories {
-        maven { url '../../repo' }
-        maven { url '../../../../prebuilts/tools/common/m2/repository' }
-        maven { url '../../../../prebuilts/tools/common/m2/internal' }
+        maven { url '../../../../out/host/gradle/repo' }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:0.4-SNAPSHOT'
diff --git a/tests/overlay2/build.gradle b/tests/overlay2/build.gradle
index 811230e..e9a55b5 100644
--- a/tests/overlay2/build.gradle
+++ b/tests/overlay2/build.gradle
@@ -1,8 +1,6 @@
 buildscript {
     repositories {
-        maven { url '../../repo' }
-        maven { url '../../../../prebuilts/tools/common/m2/repository' }
-        maven { url '../../../../prebuilts/tools/common/m2/internal' }
+        maven { url '../../../../out/host/gradle/repo' }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:0.4-SNAPSHOT'
diff --git a/tests/pkgOverride/build.gradle b/tests/pkgOverride/build.gradle
index 628f6f5..94a01ef 100644
--- a/tests/pkgOverride/build.gradle
+++ b/tests/pkgOverride/build.gradle
@@ -1,8 +1,6 @@
 buildscript {
     repositories {
-        maven { url '../../repo' }
-        maven { url '../../../../prebuilts/tools/common/m2/repository' }
-        maven { url '../../../../prebuilts/tools/common/m2/internal' }
+        maven { url '../../../../out/host/gradle/repo' }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:0.4-SNAPSHOT'
diff --git a/tests/proguard/build.gradle b/tests/proguard/build.gradle
index 07fb58e..70f3609 100644
--- a/tests/proguard/build.gradle
+++ b/tests/proguard/build.gradle
@@ -1,8 +1,6 @@
 buildscript {
     repositories {
-        maven { url '../../repo' }
-        maven { url '../../../../prebuilts/tools/common/m2/repository' }
-        maven { url '../../../../prebuilts/tools/common/m2/internal' }
+        maven { url '../../../../out/host/gradle/repo' }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:0.4-SNAPSHOT'
diff --git a/tests/proguardLib/build.gradle b/tests/proguardLib/build.gradle
index 7981280..e12126d 100644
--- a/tests/proguardLib/build.gradle
+++ b/tests/proguardLib/build.gradle
@@ -1,8 +1,6 @@
 buildscript {
     repositories {
-        maven { url '../../repo' }
-        maven { url '../../../../prebuilts/tools/common/m2/repository' }
-        maven { url '../../../../prebuilts/tools/common/m2/internal' }
+        maven { url '../../../../out/host/gradle/repo' }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:0.4-SNAPSHOT'
diff --git a/tests/renderscript/build.gradle b/tests/renderscript/build.gradle
index a0dd20b..665f26a 100644
--- a/tests/renderscript/build.gradle
+++ b/tests/renderscript/build.gradle
@@ -1,8 +1,6 @@
 buildscript {
     repositories {
-        maven { url '../../repo' }
-        maven { url '../../../../prebuilts/tools/common/m2/repository' }
-        maven { url '../../../../prebuilts/tools/common/m2/internal' }
+        maven { url '../../../../out/host/gradle/repo' }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:0.4-SNAPSHOT'
diff --git a/tests/renderscriptInLib/build.gradle b/tests/renderscriptInLib/build.gradle
index 7981280..e12126d 100644
--- a/tests/renderscriptInLib/build.gradle
+++ b/tests/renderscriptInLib/build.gradle
@@ -1,8 +1,6 @@
 buildscript {
     repositories {
-        maven { url '../../repo' }
-        maven { url '../../../../prebuilts/tools/common/m2/repository' }
-        maven { url '../../../../prebuilts/tools/common/m2/internal' }
+        maven { url '../../../../out/host/gradle/repo' }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:0.4-SNAPSHOT'
diff --git a/tests/renderscriptMultiSrc/build.gradle b/tests/renderscriptMultiSrc/build.gradle
index 0e0b05c..aa63094 100644
--- a/tests/renderscriptMultiSrc/build.gradle
+++ b/tests/renderscriptMultiSrc/build.gradle
@@ -1,8 +1,6 @@
 buildscript {
     repositories {
-        maven { url '../../repo' }
-        maven { url '../../../../prebuilts/tools/common/m2/repository' }
-        maven { url '../../../../prebuilts/tools/common/m2/internal' }
+        maven { url '../../../../out/host/gradle/repo' }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:0.4-SNAPSHOT'
diff --git a/tests/repo/app/build.gradle b/tests/repo/app/build.gradle
index 06f020e..4f3c64d 100644
--- a/tests/repo/app/build.gradle
+++ b/tests/repo/app/build.gradle
@@ -1,8 +1,6 @@
 buildscript {
     repositories {
-        maven { url '../../../repo' }
-        maven { url '../../../../../prebuilts/tools/common/m2/repository' }
-        maven { url '../../../../../prebuilts/tools/common/m2/internal' }
+        maven { url '../../../../../out/host/gradle/repo' }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:0.4-SNAPSHOT'
diff --git a/tests/repo/baseLibrary/build.gradle b/tests/repo/baseLibrary/build.gradle
index 031edb6..cedf802 100644
--- a/tests/repo/baseLibrary/build.gradle
+++ b/tests/repo/baseLibrary/build.gradle
@@ -1,8 +1,6 @@
 buildscript {
     repositories {
-        maven { url '../../../repo' }
-        maven { url '../../../../../prebuilts/tools/common/m2/repository' }
-        maven { url '../../../../../prebuilts/tools/common/m2/internal' }
+        maven { url '../../../../../out/host/gradle/repo' }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:0.4-SNAPSHOT'
diff --git a/tests/repo/library/build.gradle b/tests/repo/library/build.gradle
index 4aba1b1..dba9b9a 100644
--- a/tests/repo/library/build.gradle
+++ b/tests/repo/library/build.gradle
@@ -1,8 +1,6 @@
 buildscript {
     repositories {
-        maven { url '../../../repo' }
-        maven { url '../../../../../prebuilts/tools/common/m2/repository' }
-        maven { url '../../../../../prebuilts/tools/common/m2/internal' }
+        maven { url '../../../../../out/host/gradle/repo' }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:0.4-SNAPSHOT'
diff --git a/tests/tictactoe/build.gradle b/tests/tictactoe/build.gradle
index 7981280..e12126d 100644
--- a/tests/tictactoe/build.gradle
+++ b/tests/tictactoe/build.gradle
@@ -1,8 +1,6 @@
 buildscript {
     repositories {
-        maven { url '../../repo' }
-        maven { url '../../../../prebuilts/tools/common/m2/repository' }
-        maven { url '../../../../prebuilts/tools/common/m2/internal' }
+        maven { url '../../../../out/host/gradle/repo' }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:0.4-SNAPSHOT'