SDK: change gradle output dir to out/host/gradle.
Raphael Moll [Tue, 12 Feb 2013 18:13:12 +0000 (10:13 -0800)]
Change-Id: I73da941b4fa0c784ca11beec506279d496a02bf6

build.gradle
gradlew

index 2ea838a..d284b32 100644 (file)
@@ -1,8 +1,6 @@
 // ext.androidHostOut is shared by all tools/{base,build,swt} gradle projects/
-ext.androidHostOut = java.lang.System.getenv("ANDROID_HOST_OUT")
-if (ext.androidHostOut == null) {
-  ext.androidHostOut = "$rootDir/../../out/host/common"
-}
+ext.androidHostOut = file("$rootDir/../../out/host/gradle")
+ext.androidRootDir = file(new File(ext.androidHostOut, "../../../"))
 // rootProject.buildDir is specific to this gradle build.
 buildDir = new File(file(ext.androidHostOut), "tools/build/build")
 
diff --git a/gradlew b/gradlew
index d79595c..f0192c9 100755 (executable)
--- a/gradlew
+++ b/gradlew
@@ -163,7 +163,7 @@ JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
 
 # Change the project's .gradle to the android out dir.
 if [[ -z "$ANDROID_CACHE_DIR" ]]; then
-  ANDROID_CACHE_DIR="$APP_HOME/../../out/host/common/tools/build/.gradle"
+  ANDROID_CACHE_DIR="$APP_HOME/../../out/host/gradle/tools/build/.gradle"
 fi
 
 exec "$JAVACMD" "${JVM_OPTS[@]}" \