commit 55fad07057c2b5173538bc4e16340ff7ece55d4c
author Shinichiro Hamaji <hamaji@google.com> Tue Mar 15 23:08:50 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Mar 15 23:08:50 2016 +0000
tree ba249ce80f847b80b83f4493cdfbab0e527af67b
parent 267425b630ef205c6b6f366631ef0991151a2a97
parent 082d5e5081732c6c4d42069b2f3fd560dcce768d

Merge "Replace last -includes by .KATI_DEPFILE" am: c26ec724b8
am: 082d5e5081

* commit '082d5e5081732c6c4d42069b2f3fd560dcce768d':
  Replace last -includes by .KATI_DEPFILE

core/build_id.mk

diff --git a/core/build_id.mk b/core/build_id.mk
index 5a012b9..0e8e2cf 100644
--- a/core/build_id.mk
+++ b/core/build_id.mk
@@ -18,4 +18,4 @@
 # (like "CRB01").  It must be a single word, and is
 # capitalized by convention.
 
-export BUILD_ID=NYC
+export BUILD_ID=MASTER

envsetup.sh

diff --git a/envsetup.sh b/envsetup.sh
index b1aab34..882827e 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -89,7 +89,7 @@
 {
     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 @@
 {
     if [ "$BUILD_VAR_CACHE_READY" = "true" ]
     then
-        eval echo \"\${var_cache_$1}\"
+        eval "echo \"\${var_cache_$1}\""
     return
     fi