Android: fix webview-in-android build config.

build/android/envsetup.sh

Index: build/android/envsetup.sh
diff --git a/build/android/envsetup.sh b/build/android/envsetup.sh
index 741057e6b4c4596a09e27bc1b178731e2b19d6ba..f94ca65b7b2aff0cec095f86ac27d00ac43a62fb 100755
--- a/build/android/envsetup.sh
+++ b/build/android/envsetup.sh
@@ -10,9 +10,15 @@
 # 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
@@ -75,6 +81,8 @@ elif [[ -z "$ANDROID_BUILD_TOP" || \
   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