diff options
| author | Colin Cross <ccross@android.com> | 2015-04-08 16:02:08 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@google.com> | 2015-04-09 00:13:44 +0000 |
| commit | 10787d046d0cba050e6d44807fda75a09063efe1 (patch) | |
| tree | 8029486c425a4ddda0ff714f8f7f3a40f2c31ba1 /soong.bash | |
| parent | c0b06f191f99379d3e8111f3bb149a53b1054422 (diff) | |
| download | build_soong-10787d046d0cba050e6d44807fda75a09063efe1.tar.gz build_soong-10787d046d0cba050e6d44807fda75a09063efe1.tar.bz2 build_soong-10787d046d0cba050e6d44807fda75a09063efe1.zip | |
Fix running soong from different directory
${BOOTSTRAP} already contains ${BUILDDIR}
Change-Id: Ie1303e4b2a5ce415f565ffc4b6125071e427bd43
Diffstat (limited to 'soong.bash')
| -rwxr-xr-x | soong.bash | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -8,12 +8,12 @@ BOOTSTRAP=${BUILDDIR}/.soong.bootstrap # 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 |