Browse Source

Fix running soong from different directory

${BOOTSTRAP} already contains ${BUILDDIR}

Change-Id: Ie1303e4b2a5ce415f565ffc4b6125071e427bd43
Colin Cross 9 years ago
parent
commit
10787d046d
1 changed files with 2 additions and 2 deletions
  1. 2 2
      soong.bash

+ 2 - 2
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