diff --git a/envsetup.sh b/envsetup.sh
index 101ef1371a..3393b75317 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -89,7 +89,7 @@ function get_abs_build_var()
 {
     if [ "$BUILD_VAR_CACHE_READY" = "true" ]
     then
-        eval echo \"\${abs_var_cache_$1}\"
+        eval "echo \"\${abs_var_cache_$1}\""
     return
     fi
 
@@ -107,7 +107,7 @@ function get_build_var()
 {
     if [ "$BUILD_VAR_CACHE_READY" = "true" ]
     then
-        eval echo \"\${var_cache_$1}\"
+        eval "echo \"\${var_cache_$1}\""
     return
     fi