commit 7e5a2e79b848a8c0373d65f2324f5f999a458518
author Colin Cross <ccross@android.com> Tue Mar 31 17:43:27 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Mar 31 17:43:27 2015 +0000
tree 4bedcfdf3b48c520be04030b1175ee2dbaf80ec1
parent a42a6ffd763311472c916072d3c2a99aaa5a2ae5
parent 1da2494f7a98a8e85c9115fb012b798c9facc68f

am 1da2494f: Merge "Remove copied reference to undefined local_javac_flags"

* commit '1da2494f7a98a8e85c9115fb012b798c9facc68f':
  Remove copied reference to undefined local_javac_flags

build.gradle

diff --git a/build.gradle b/build.gradle
index 6e0a62e..722846c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -30,13 +30,6 @@
     }
 }
 
-dependencies {
-    targetCompile getAndroidPrebuilt('4')
-    targetCompile project(':hamcrest')
-
-    hostCompile project(':hamcrest')
-}
-
 task targetJar(type: Jar) {
     from sourceSets.target.output
     dependsOn targetClasses
@@ -55,3 +48,23 @@
     host hostJar
     target targetJar
 }
+
+if (project.hasProperty("usePrebuilts") && project.usePrebuilts == "true") {
+    repositories {
+        maven { url '../../prebuilts/tools/common/m2/repository' }
+    }
+
+    dependencies {
+        targetCompile getAndroidPrebuilt('4')
+        targetCompile 'org.hamcrest:hamcrest-core:1.1'
+
+        hostCompile 'org.hamcrest:hamcrest-core:1.1'
+    }
+} else {
+    dependencies {
+        targetCompile getAndroidPrebuilt('4')
+        targetCompile project(':hamcrest')
+
+        hostCompile project(':hamcrest')
+    }
+}