aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Cross2015-04-08 18:02:08 -0500
committerColin Cross2015-04-08 19:13:44 -0500
commit10787d046d0cba050e6d44807fda75a09063efe1 (patch)
tree8029486c425a4ddda0ff714f8f7f3a40f2c31ba1 /soong.bash
parentc0b06f191f99379d3e8111f3bb149a53b1054422 (diff)
downloadplatform-build-soong-10787d046d0cba050e6d44807fda75a09063efe1.tar.gz
platform-build-soong-10787d046d0cba050e6d44807fda75a09063efe1.tar.xz
platform-build-soong-10787d046d0cba050e6d44807fda75a09063efe1.zip
Fix running soong from different directory
${BOOTSTRAP} already contains ${BUILDDIR} Change-Id: Ie1303e4b2a5ce415f565ffc4b6125071e427bd43
Diffstat (limited to 'soong.bash')
-rwxr-xr-xsoong.bash4
1 files changed, 2 insertions, 2 deletions
diff --git a/soong.bash b/soong.bash
index fab15de5..b282a1e7 100755
--- a/soong.bash
+++ b/soong.bash
@@ -8,12 +8,12 @@ BOOTSTRAP=${BUILDDIR}/.soong.bootstrap
8# The source directory path and operating system will get written to 8# The source directory path and operating system will get written to
9# .soong.bootstrap by the bootstrap script. 9# .soong.bootstrap by the bootstrap script.
10 10
11if [ ! -f ${BUILDDIR}/${BOOTSTRAP} ]; then 11if [ ! -f ${BOOTSTRAP} ]; then
12 echo "Error: soong script must be located in a directory created by bootstrap.bash" 12 echo "Error: soong script must be located in a directory created by bootstrap.bash"
13 exit 1 13 exit 1
14fi 14fi
15 15
16source ${BUILDDIR}/.soong.bootstrap 16source ${BOOTSTRAP}
17 17
18if [[ ${SRCDIR_IN:0:1} == '/' ]]; then 18if [[ ${SRCDIR_IN:0:1} == '/' ]]; then
19 # SRCDIR_IN is an absolute path 19 # SRCDIR_IN is an absolute path