openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix running soong from different directory 

${BOOTSTRAP} already contains ${BUILDDIR}

Change-Id: Ie1303e4b2a5ce415f565ffc4b6125071e427bd43
This commit is contained in:
Colin Cross 2015-04-08 16:02:08 -07:00 committed by Colin Cross
parent c0b06f191f
commit 10787d046d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
soong.bash
View File

@ -8,12 +8,12 @@ BOOTSTRAP=${BUILDDIR}/.soong.bootstrap
# The source directory path and operating system will get written to # The source directory path and operating system will get written to
# .soong.bootstrap by the bootstrap script. # .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" echo "Error: soong script must be located in a directory created by bootstrap.bash"
exit 1 exit 1
fi fi
source ${BUILDDIR}/.soong.bootstrap source ${BOOTSTRAP}
if [[ ${SRCDIR_IN:0:1} == '/' ]]; then if [[ ${SRCDIR_IN:0:1} == '/' ]]; then
# SRCDIR_IN is an absolute path # SRCDIR_IN is an absolute path