Move android_webview_build variable to toolchain.gypi to fix arm builders.

R=jkummerow@chromium.org

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

git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@22470 ce2b1a6d-e550-0410-aec6-3dcde31c8c00

diff --git a/build/android.gypi b/build/android.gypi
index e5b8719..87bdbcb 100644 (file)
--- a/build/android.gypi
+++ b/build/android.gypi
@@ -35,9 +35,6 @@
     'variables': {
       'android_ndk_root%': '<!(/bin/echo -n $ANDROID_NDK_ROOT)',
       'android_toolchain%': '<!(/bin/echo -n $ANDROID_TOOLCHAIN)',
-      # This is set when building the Android WebView inside the Android build
-      # system, using the 'android' gyp backend.
-      'android_webview_build%': 0,
     },
     'conditions': [
       ['android_ndk_root==""', {

diff --git a/build/toolchain.gypi b/build/toolchain.gypi
index 8c6df83..f2847c5 100644 (file)
--- a/build/toolchain.gypi
+++ b/build/toolchain.gypi
@@ -82,6 +82,12 @@
 
     # Allow to suppress the array bounds warning (default is no suppression).
     'wno_array_bounds%': '',
+
+    'variables': {
+      # This is set when building the Android WebView inside the Android build
+      # system, using the 'android' gyp backend.
+      'android_webview_build%': 0,
+    }
   },
   'conditions': [
     ['host_arch=="ia32" or host_arch=="x64" or clang==1', {