Android: fix webview-in-android build config.

build/android/envsetup.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.
 
 # 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 --sdk".  Environment variable
 # ANDROID_SDK_BUILD=1 will then be defined and used in the rest of the setup to
 # specifiy build type.
 
+# When building WebView as part of Android we can't use the SDK. Other builds
+# default to using the SDK.
 # NOTE(yfriedman): This looks unnecessary but downstream the default value
 # should be 0 until all builds switch to SDK/NDK.
-export ANDROID_SDK_BUILD=1
+if [[ "${CHROME_ANDROID_BUILD_WEBVIEW}" -eq 1 ]]; then
+  export ANDROID_SDK_BUILD=0

[Yaron, 2012/10/04 16:04:42]

Hmm. So in theory, we plan to remove the SDK_BUILD flag as everything will be
SDK. I guess if you still need customizations at that point, we can make the
distinction as webview/non-webview. Sound reasonable?

[Torne, 2012/10/04 16:10:33]

Sure, we can just make the remaining things directly conditional on
CHROME_ANDROID_BUILD_WEBVIEW when you want to kill ANDROID_SDK_BUILD.

+else
+  export ANDROID_SDK_BUILD=1
+fi
 # Loop over args in case we add more arguments in the future.
 while [ "$1" != "" ]; do
   case $1 in
     -s | --sdk  ) export ANDROID_SDK_BUILD=1 ; shift ;;
     *  )          shift ; break ;;
   esac
 done
 
 if [[ "${ANDROID_SDK_BUILD}" -eq 1 ]]; then
   echo "Using SDK build"
@@ skipping 42 matching lines @@
 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 with --sdk argument."
   return 1
+elif [[ -n "$CHROME_ANDROID_BUILD_WEBVIEW" ]]; then
+  webview_build_init
 else
   non_sdk_build_init
 fi
 
 # Workaround for valgrind build
 if [[ -n "$CHROME_ANDROID_VALGRIND_BUILD" ]]; then
 # arm_thumb=0 is a workaround for https://bugs.kde.org/show_bug.cgi?id=270709
   DEFINES+=" arm_thumb=0 release_extra_cflags='-fno-inline\
  -fno-omit-frame-pointer -fno-builtin' release_valgrind_build=1\
  release_optimize=1"
@@ skipping 28 matching lines @@
       if echo "$CXX_target" | grep -q g++; then
         unset CXX_target
       fi
     fi
     "${CHROME_SRC}/build/gyp_chromium" --depth="${CHROME_SRC}" --check "$@"
   )
 }
 
 # FLOCK needs to be null on system that has no flock
 which flock > /dev/null || export FLOCK=