From 10787d046d0cba050e6d44807fda75a09063efe1 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Wed, 8 Apr 2015 16:02:08 -0700 Subject: [PATCH] Fix running soong from different directory ${BOOTSTRAP} already contains ${BUILDDIR} Change-Id: Ie1303e4b2a5ce415f565ffc4b6125071e427bd43 --- soong.bash | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/soong.bash b/soong.bash index fab15de5f..b282a1e79 100755 --- a/soong.bash +++ b/soong.bash @@ -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