commit 10787d046d0cba050e6d44807fda75a09063efe1
author Colin Cross <ccross@android.com> Wed Apr 08 16:02:08 2015 -0700
committer Colin Cross <ccross@google.com> Thu Apr 09 00:13:44 2015 +0000
tree 8029486c425a4ddda0ff714f8f7f3a40f2c31ba1
parent c0b06f191f99379d3e8111f3bb149a53b1054422

Fix running soong from different directory

${BOOTSTRAP} already contains ${BUILDDIR}

Change-Id: Ie1303e4b2a5ce415f565ffc4b6125071e427bd43

soong.bash

diff --git a/soong.bash b/soong.bash
index fab15de..b282a1e 100755
--- a/soong.bash
+++ b/soong.bash
@@ -8,12 +8,12 @@
 # The source directory path and operating system will get written to
 # .soong.bootstrap by the bootstrap script.
 
-if [ ! -f ${BUILDDIR}/${BOOTSTRAP} ]; then
+if [ ! -f ${BOOTSTRAP} ]; then
     echo "Error: soong script must be located in a directory created by bootstrap.bash"
     exit 1
 fi
 
-source ${BUILDDIR}/.soong.bootstrap
+source ${BOOTSTRAP}
 
 if [[ ${SRCDIR_IN:0:1} == '/' ]]; then
     # SRCDIR_IN is an absolute path