aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Moreland2018-01-05 14:13:11 -0600
committerSteven Moreland2018-01-05 14:15:36 -0600
commit0540296e9f3bf1ad66e644a81d9891db304c3f59 (patch)
treedaad2f8a7e1b2c83027493bb5a941a329fd66a08 /envsetup.sh
parentb0f4677748de40ba8065ab9f98afc2c2c24c5547 (diff)
downloadplatform-build-0540296e9f3bf1ad66e644a81d9891db304c3f59.tar.gz
platform-build-0540296e9f3bf1ad66e644a81d9891db304c3f59.tar.xz
platform-build-0540296e9f3bf1ad66e644a81d9891db304c3f59.zip
envsetup.sh: don't assume 'cd' is builtin
Some parts of envsetup.sh aren't very happy with things like this: function cd() { builtin cd "$@" && pwd && ls -l } here, I have s/cd/builtin cd/ one such case where envsetup is trying to execute the output of cd. Test: manual Change-Id: I2774481dfbd958410682a4f773f1b8f12a0080aa
Diffstat (limited to 'envsetup.sh')
-rw-r--r--envsetup.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/envsetup.sh b/envsetup.sh
index 394df6564..fe22111c4 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -51,7 +51,7 @@ function build_build_var_cache()
51 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' ' '` 51 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' ' '`
52 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' ' '` 52 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' ' '`
53 # Call the build system to dump the "<val>=<value>" pairs as a shell script. 53 # Call the build system to dump the "<val>=<value>" pairs as a shell script.
54 build_dicts_script=`\cd $T; build/soong/soong_ui.bash --dumpvars-mode \ 54 build_dicts_script=`\builtin cd $T; build/soong/soong_ui.bash --dumpvars-mode \
55 --vars="$cached_vars" \ 55 --vars="$cached_vars" \
56 --abs-vars="$cached_abs_vars" \ 56 --abs-vars="$cached_abs_vars" \
57 --var-prefix=var_cache_ \ 57 --var-prefix=var_cache_ \