envsetup: Unbreak android_gyp for a while.

build/android/envsetup.sh

Index: build/android/envsetup.sh
diff --git a/build/android/envsetup.sh b/build/android/envsetup.sh
index 33247a24518d2f833c9bfa8a3ea62d435c8894a8..375ef67af99e1267dbdf53ccb748a0056b227ed5 100755
--- a/build/android/envsetup.sh
+++ b/build/android/envsetup.sh
@@ -46,10 +46,12 @@ android_envsetup_main() {
   # Add Chromium Android development scripts to system path.
   # Must be after CHROME_SRC is set.
   export PATH=$PATH:${CHROME_SRC}/build/android
+
+  export ENVSETUP_GYP_CHROME_SRC=${CHROME_SRC}  # TODO(thakis): Remove.
 }
 android_envsetup_main
 
 android_gyp() {
   echo "Please call build/gyp_chromium instead. android_gyp is going away."
-  "${CHROME_SRC}/build/gyp_chromium" --depth="${CHROME_SRC}" --check "$@"
+  "${ENVSETUP_GYP_CHROME_SRC}/build/gyp_chromium" --depth="${ENVSETUP_GYP_CHROME_SRC}" --check "$@"
 }