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

33 files changed, 85 insertions, 140 deletions

diff --git a/build.gradle b/build.gradle
index 5197b98..ec03142 100644
--- a/build.gradle
+++ b/build.gradle
@@ -30,11 +30,6 @@ subprojects {
     apply plugin: 'findbugs'
 
     repositories {
-        // repository containing the cloned 3rd party artifacts.
-        maven { url = uri(rootProject.cloneArtifacts.mainRepo) }
-        maven { url = uri(rootProject.cloneArtifacts.secondaryRepo) }
-
-        // repository with the artifacts from tools/base
         maven { url = uri("$rootProject.ext.androidHostOut/repo") }
     }
 
@@ -68,6 +63,12 @@ subprojects {
     project.ext.baseAndroidVersion = "22.0-SNAPSHOT"
 }
 
+task prepareRepo(type: Copy) {
+    from { rootProject.cloneArtifacts.mainRepo }
+    from { rootProject.cloneArtifacts.secondaryRepo }
+    into { "$rootProject.ext.androidHostOut/repo" }
+}
+
 // delay evaluation of this project before all subprojects have been evaluated.
 subprojects.each { subproject -> evaluationDependsOn(subproject.name) }
 
diff --git a/builder-model/build.gradle b/builder-model/build.gradle
index 6a13c79..919d112 100644
--- a/builder-model/build.gradle
+++ b/builder-model/build.gradle
@@ -18,14 +18,14 @@ def getVersion() {
 version = getVersion()
 archivesBaseName = 'builder-model'
 
-//task publishLocal(type: Upload) {
-//    configuration = configurations.archives
-//    repositories {
-//        mavenDeployer {
-//            repository(url: uri("$rootDir/repo"))
-//        }
-//    }
-//}
+task publishLocal(type: Upload) {
+    configuration = configurations.archives
+    repositories {
+        mavenDeployer {
+            repository(url: uri("$rootProject.ext.androidHostOut/repo"))
+        }
+    }
+}
 
 // custom tasks for creating source/javadoc jars
 task sourcesJar(type: Jar, dependsOn:classes) {
diff --git a/builder/build.gradle b/builder/build.gradle
index 7de0b1b..5472b0b 100644
--- a/builder/build.gradle
+++ b/builder/build.gradle
@@ -5,9 +5,9 @@ apply plugin: 'clone-artifacts'
 
 evaluationDependsOn(':builder-model') 
 
-configurations {
-    fakeMaven
-}
+//configurations {
+//    fakeMaven
+//}
 
 dependencies {
     compile project(':builder-model')
@@ -33,61 +33,62 @@ def getVersion() {
 version = getVersion()
 archivesBaseName = 'builder'
 
-def getInternalDependencies() {
-    def list = []
-
-    Set<ResolvedArtifact> artifacts = configurations.runtime.resolvedConfiguration.resolvedArtifacts
-    for (ResolvedArtifact artifact : artifacts) {
-        def group = artifact.moduleVersion.id.group
-        if (group.startsWith('com.android.tools') || group == 'base' || group == 'swt') {
-            list << artifact.file
-        }
-    }
-
-    list
-}
+//def getInternalDependencies() {
+//    def list = []
+//
+//    Set<ResolvedArtifact> artifacts = configurations.runtime.resolvedConfiguration.resolvedArtifacts
+//    for (ResolvedArtifact artifact : artifacts) {
+//        def group = artifact.moduleVersion.id.group
+//        if (group.startsWith('com.android.tools') || group == 'base' || group == 'swt') {
+//            list << artifact.file
+//       }
+//    }
+//
+//    list
+//}
 
 jar {
     // gather the local dependencies and package them in the builder jar.
-    def internalDep = getInternalDependencies()
-    from { internalDep.collect { it.directory ? it : zipTree(it) } }
+//    def internalDep = getInternalDependencies()
+//    from { internalDep.collect { it.directory ? it : zipTree(it) } }
 }
 
 // add the external dependencies to the fakeMaven configuration.
-task mavenSetup << {
-    Set<ResolvedArtifact> artifacts = configurations.runtime.resolvedConfiguration.resolvedArtifacts
-    for (ResolvedArtifact artifact : artifacts) {
-        def group = artifact.moduleVersion.id.group
-        if (!(group.startsWith('com.android.tools') || group == 'base' || group == 'swt')) {
-            def id = artifact.moduleVersion.id
-            project.dependencies {
-                fakeMaven "${id.group}:${id.name}:${id.version}"
-            }
-        }
-    }
-}
+//task mavenSetup << {
+//    Set<ResolvedArtifact> artifacts = configurations.runtime.resolvedConfiguration.resolvedArtifacts
+//    for (ResolvedArtifact artifact : artifacts) {
+//        def group = artifact.moduleVersion.id.group
+//        if (!(group.startsWith('com.android.tools') || group == 'base' || group == 'swt')) {
+//            def id = artifact.moduleVersion.id
+//            project.dependencies {
+//                fakeMaven "${id.group}:${id.name}:${id.version}"
+//            }
+//        }
+//    }
+//}
 
 configure(install.repositories.mavenInstaller) {
     // Discard all the dependencies from the POM, as they are packaged in the JAR.
-    pom.scopeMappings.mappings.clear()
+//    pom.scopeMappings.mappings.clear()
     // add the fake ones from fakeMaven
-    pom.scopeMappings.addMapping(300, configurations.fakeMaven, "compile")
+//    pom.scopeMappings.addMapping(300, configurations.fakeMaven, "compile")
 }
 
-task publishLocal(type: Upload, dependsOn: mavenSetup) {
+task publishLocal(type: Upload) {
     configuration = configurations.archives
     repositories {
         mavenDeployer {
-            repository(url: uri("$rootDir/repo"))
+            repository(url: uri("$rootProject.ext.androidHostOut/repo"))
 
             // Discard all the dependencies from the POM, as they are packaged in the JAR.
-            pom.scopeMappings.mappings.clear()
+//            pom.scopeMappings.mappings.clear()
             // add the fake ones from fakeMaven
-            pom.scopeMappings.addMapping(300, configurations.fakeMaven, "compile")
+//            pom.scopeMappings.addMapping(300, configurations.fakeMaven, "compile")
         }
     }
 }
-//publishLocal.dependsOn ':builder-model:publishLocal'
+//publishLocal.dependsOn mavenSetup
+publishLocal.dependsOn ':builder-model:publishLocal'
 
 project.ext.sonatypeUsername = hasProperty('sonatypeUsername') ? sonatypeUsername : ""
 project.ext.sonatypePassword = hasProperty('sonatypePassword') ? sonatypePassword : ""
@@ -112,7 +113,7 @@ uploadArchives {
             }
 
             // Discard all the dependencies from the POM, as they are packaged in the JAR.
-            pom.scopeMappings.mappings.clear()
+//            pom.scopeMappings.mappings.clear()
 
             pom.project {
                 name 'Android Builder library'
@@ -142,7 +143,7 @@ uploadArchives {
     }
 }
 
-uploadArchives.dependsOn mavenSetup
+//uploadArchives.dependsOn mavenSetup
 
 
 // custom tasks for creating source/javadoc jars
diff --git a/gradle-model/build.gradle b/gradle-model/build.gradle
index 47affba..724bab4 100644
--- a/gradle-model/build.gradle
+++ b/gradle-model/build.gradle
@@ -14,8 +14,7 @@ configurations{
 dependencies {
     // should be build-model but until builder is in a repo w/o it's local dependencies, we have to
     // depend on builder itself to not have a dependency on 'common'
-    //compile project(':builder-model')
-    compile project(':builder')
+    compile project(':builder-model')
 
     testCompile 'junit:junit:3.8.1'
     // Need an SLF4J implementation at runtime
@@ -49,7 +48,7 @@ task publishLocal(type: Upload) {
     configuration = configurations.archives
     repositories {
         mavenDeployer {
-            repository(url: uri("$rootDir/repo"))
+            repository(url: uri("$rootProject.ext.androidHostOut/repo"))
         }
     }
 }
diff --git a/gradle/build.gradle b/gradle/build.gradle
index 78613a7..673c7c7 100644
--- a/gradle/build.gradle
+++ b/gradle/build.gradle
@@ -83,7 +83,7 @@ task publishLocal(type: Upload) {
     configuration = configurations.archives
     repositories {
         mavenDeployer {
-            repository(url: uri("$rootDir/repo"))
+            repository(url: uri("$rootProject.ext.androidHostOut/repo"))
         }
     }
 }
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'