commit c10bd0d8591ed4f051b38cd51300f3da5701354d
author Treehugger Robot <treehugger-gerrit@google.com> Thu Jan 11 03:52:46 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jan 11 03:52:46 2018 +0000
tree 6c55b4fea8b6c2352a22a564191557f8e6a2215e
parent 08dc8498feeabe97449ef561f903b02551174d5a
parent 0540296e9f3bf1ad66e644a81d9891db304c3f59

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

envsetup.sh

diff --git a/envsetup.sh b/envsetup.sh
index 576c234..372dffb 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -51,7 +51,7 @@
     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_ \