Merge "envsetup.sh: don't assume 'cd' is builtin"

am: c10bd0d859

Change-Id: I80c2cd4b943889fb51976c79857ca8ad98f8482d
This commit is contained in:
Steven Moreland 2018-01-11 04:04:09 +00:00 committed by android-build-merger
commit 0cc00d2639
1 changed files with 1 additions and 1 deletions

View File

@ -51,7 +51,7 @@ function build_build_var_cache()
cached_vars=`cat $T/build/envsetup.sh | tr '()' ' ' | awk '{for(i=1;i<=NF;i++) if($i~/get_build_var/) print $(i+1)}' | sort -u | tr '\n' ' '`
cached_abs_vars=`cat $T/build/envsetup.sh | tr '()' ' ' | awk '{for(i=1;i<=NF;i++) if($i~/get_abs_build_var/) print $(i+1)}' | sort -u | tr '\n' ' '`
# Call the build system to dump the "<val>=<value>" pairs as a shell script.
build_dicts_script=`\cd $T; build/soong/soong_ui.bash --dumpvars-mode \
build_dicts_script=`\builtin cd $T; build/soong/soong_ui.bash --dumpvars-mode \
--vars="$cached_vars" \
--abs-vars="$cached_abs_vars" \
--var-prefix=var_cache_ \