[Android] Set sdk version and sdk root in GYP_DEFINES via envsetup.sh.

build/android/envsetup_functions.sh

Index: build/android/envsetup_functions.sh
diff --git a/build/android/envsetup_functions.sh b/build/android/envsetup_functions.sh
index fef07ef9cf93c57d5f547f3388c6bdedcbdd2164..dc95dd398baa1d62c410957a812f7ed8709c1692 100755
--- a/build/android/envsetup_functions.sh
+++ b/build/android/envsetup_functions.sh
@@ -223,16 +223,21 @@ sdk_build_init() {
   # Allow the caller to override a few environment variables. If any of them is
   # unset, we default to a sane value that's known to work. This allows for
   # experimentation with a custom SDK.
+  SDK_DEFINES=""

[Yaron, 2013/08/23 01:18:53]

Please change this to a local (local sdk_defines="")

   if [[ -z "${ANDROID_NDK_ROOT}" || ! -d "${ANDROID_NDK_ROOT}" ]]; then
     export ANDROID_NDK_ROOT="${CHROME_SRC}/third_party/android_tools/ndk/"
   fi
   if [[ -z "${ANDROID_SDK_VERSION}" ]]; then
     export ANDROID_SDK_VERSION=18
+  else
+    SDK_DEFINES+=" android_sdk_version=${ANDROID_SDK_VERSION}"
   fi
   local sdk_suffix=platforms/android-${ANDROID_SDK_VERSION}
   if [[ -z "${ANDROID_SDK_ROOT}" || \
        ! -d "${ANDROID_SDK_ROOT}/${sdk_suffix}" ]]; then
     export ANDROID_SDK_ROOT="${CHROME_SRC}/third_party/android_tools/sdk/"
+  else
+    SDK_DEFINES+=" android_sdk_root=${ANDROID_SDK_ROOT}"
   fi
   if [[ -z "${ANDROID_SDK_BUILD_TOOLS_VERSION}" ]]; then
     export ANDROID_SDK_BUILD_TOOLS_VERSION=18.0.1
@@ -248,6 +253,9 @@ sdk_build_init() {
   unset ANDROID_TOOLCHAIN
 
   common_vars_defines
+
+  DEFINES+="${SDK_DEFINES}"
+
   common_gyp_vars
 
   if [[ -n "$CHROME_ANDROID_BUILD_WEBVIEW" ]]; then