android envsetup: Use gyp defines instead of env vars for sdk root and sdk tools.

build/android/envsetup_functions.sh

 #!/bin/bash
 
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Defines functions for envsetup.sh which sets up environment for building
 # Chromium on Android.  The build can be either use the Android NDK/SDK or
 # android source tree.  Each has a unique init function which calls functions
 # prefixed with "common_" that is common for both environment setups.
@@ skipping 80 matching lines @@
   done
 
   # Sets TARGET_ARCH. Defaults to arm if not specified.
   TARGET_ARCH=${target_arch:-arm}
 }
 
 ################################################################################
 # Initializes environment variables for NDK/SDK build.
 ################################################################################
 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.
-  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_ROOT}" || ! -d "${ANDROID_SDK_ROOT}" ]]; 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=19.0.0
   fi
 
   common_vars_defines
 
-  DEFINES+="${sdk_defines}"
-
   export GYP_DEFINES="${DEFINES}"
 
   if [[ -n "$CHROME_ANDROID_BUILD_WEBVIEW" ]]; then
     # Can not build WebView with NDK/SDK because it needs the Android build
     # system and build inside an Android source tree.
     echo "Can not build WebView with NDK/SDK.  Requires android source tree." \
         >& 2
     echo "Try . build/android/envsetup.sh instead." >& 2
     return 1
   fi
-
-  # Directory containing build-tools: aapt, aidl, dx
-  export ANDROID_SDK_TOOLS="${ANDROID_SDK_ROOT}/build-tools/\
-${ANDROID_SDK_BUILD_TOOLS_VERSION}"
 }
 
 ################################################################################
 # To build WebView, we use the Android build system and build inside an Android
 # source tree.
 #############################################################################
 webview_build_init() {
   # Use the latest API in the AOSP prebuilts directory (change with AOSP roll).
   android_sdk_version=18
 
@@ skipping 21 matching lines @@
   DEFINES+=" android_sdk_root=\$(PWD)/${ANDROID_SDK}"
   DEFINES+=" android_sdk_tools=\$(PWD)/${ANDROID_SDK_TOOLS}"
   DEFINES+=" android_sdk_version=${android_sdk_version}"
   DEFINES+=" android_toolchain=${ANDROID_TOOLCHAIN}"
   if [[ -n "$CHROME_ANDROID_WEBVIEW_OFFICIAL_BUILD" ]]; then
     DEFINES+=" logging_like_official_build=1"
     DEFINES+=" tracing_like_official_build=1"
   fi
   export GYP_DEFINES="${DEFINES}"
 }