android webview build: Stop using envsetup.

By now, envsetup only sets OS=android and converts GOMA_DIR to the corresponding
gyp defines. It also sets GYP_CROSSCOMPILE. Nothing but the OS=android bit is
used by the webview build, so let android_webview/tools/gyp_webview set what
it needs directly instead of going through envsetup.

(envsetup also does a few envvar chanes to PATH etc, but gyp_webview calls
envsetup in a subshell, so it doesn't see these changes anyways.)

As a side effect, android_webview/tools/gyp_webview no longer ignores
GYP_DEFINES from the environment.

BUG=330631
R=torne@chromium.org

Review URL: https://codereview.chromium.org/170533004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@252293 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 2 insertions, 32 deletions

diff --git a/build/android/envsetup.sh b/build/android/envsetup.sh
index e8a373c..9d4d3f5 100755
--- a/build/android/envsetup.sh
+++ b/build/android/envsetup.sh
@@ -3,11 +3,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-# Sets up environment for building Chromium on Android.  It can either be
-# compiled with the Android tree or using the Android SDK/NDK. To build with
-# NDK/SDK: ". build/android/envsetup.sh".  Environment variable
-# ANDROID_SDK_BUILD=1 will then be defined and used in the rest of the setup to
-# specifiy build type.
+# Sets up environment for building Chromium on Android.
 
 # Make sure we're being sourced (possibly by another script). Check for bash
 # since zsh sets $0 when sourcing.
@@ -26,16 +22,6 @@ if ! process_options "$@" ; then
   return 1
 fi
 
-# When building WebView as part of Android we can't use the SDK. Other builds
-# default to using the SDK.
-if [[ "${CHROME_ANDROID_BUILD_WEBVIEW}" -eq 1 ]]; then
-  export ANDROID_SDK_BUILD=0
-fi
-
-if [[ "${ANDROID_SDK_BUILD}" -ne 1 ]]; then
-  echo "Initializing for non-SDK build."
-fi
-
 # Get host architecture, and abort if it is 32-bit.
 host_arch=$(uname -m)
 case "${host_arch}" in
@@ -67,23 +53,7 @@ the one you want."
   echo "${CHROME_SRC}"
 fi
 
-if [[ "${ANDROID_SDK_BUILD}" -eq 1 ]]; then
-  sdk_build_init
-# Sets up environment for building Chromium for Android with source. Expects
-# android environment setup and lunch.
-elif [[ -z "$ANDROID_BUILD_TOP" || \
-        -z "$ANDROID_TOOLCHAIN" || \
-        -z "$ANDROID_PRODUCT_OUT" ]]; then
-  echo "Android build environment variables must be set."
-  echo "Please cd to the root of your Android tree and do: "
-  echo "  . build/envsetup.sh"
-  echo "  lunch"
-  echo "Then try this again."
-  echo "Or did you mean NDK/SDK build. Run envsetup.sh without any arguments."
-  return 1
-elif [[ -n "$CHROME_ANDROID_BUILD_WEBVIEW" ]]; then
-  webview_build_init
-fi
+sdk_build_init
 
 # Source a bunch of helper functions
 . ${CHROME_SRC}/build/android/adb_device_functions.sh