Merge "Clean up: use constants where we should be using them."
diff --git a/build.gradle b/build.gradle
index 2ea838a..d284b32 100644
--- a/build.gradle
+++ b/build.gradle
@@ -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
--- a/gradlew
+++ b/gradlew
@@ -163,7 +163,7 @@
# 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[@]}" \