Commit d09d81f9 authored by rmcilroy@chromium.org's avatar rmcilroy@chromium.org

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
parent 9d5bd592
...@@ -35,9 +35,6 @@ ...@@ -35,9 +35,6 @@
'variables': { 'variables': {
'android_ndk_root%': '<!(/bin/echo -n $ANDROID_NDK_ROOT)', 'android_ndk_root%': '<!(/bin/echo -n $ANDROID_NDK_ROOT)',
'android_toolchain%': '<!(/bin/echo -n $ANDROID_TOOLCHAIN)', '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': [ 'conditions': [
['android_ndk_root==""', { ['android_ndk_root==""', {
......
...@@ -82,6 +82,12 @@ ...@@ -82,6 +82,12 @@
# Allow to suppress the array bounds warning (default is no suppression). # Allow to suppress the array bounds warning (default is no suppression).
'wno_array_bounds%': '', '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': [ 'conditions': [
['host_arch=="ia32" or host_arch=="x64" or clang==1', { ['host_arch=="ia32" or host_arch=="x64" or clang==1', {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment