From 9d5bd5920410bbcb1309d600ef333e736e9819cb Mon Sep 17 00:00:00 2001 From: "rmcilroy@chromium.org" Date: Fri, 18 Jul 2014 10:17:01 +0000 Subject: [PATCH] Fix the android_webview build's gyp files after the changes in r22444. The android_webview get's it's compiler flags from the Android build system, so we should not be setting these flags in gyp when building the webview. R=jkummerow@chromium.org Review URL: https://codereview.chromium.org/399413002 git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@22467 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- build/toolchain.gypi | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/build/toolchain.gypi b/build/toolchain.gypi index 6cad1e2..8c6df83 100644 --- a/build/toolchain.gypi +++ b/build/toolchain.gypi @@ -143,7 +143,7 @@ 'target_conditions': [ ['_toolset=="host"', { 'conditions': [ - ['v8_target_arch==host_arch', { + ['v8_target_arch==host_arch and android_webview_build==0', { # Host built with an Arm CXX compiler. 'conditions': [ [ 'arm_version==7', { @@ -186,7 +186,7 @@ }], # _toolset=="host" ['_toolset=="target"', { 'conditions': [ - ['v8_target_arch==target_arch', { + ['v8_target_arch==target_arch and android_webview_build==0', { # Target built with an Arm CXX compiler. 'conditions': [ [ 'arm_version==7', { @@ -250,7 +250,7 @@ 'V8_TARGET_ARCH_MIPS', ], 'conditions': [ - ['v8_target_arch==target_arch', { + ['v8_target_arch==target_arch and android_webview_build==0', { # Target built with a Mips CXX compiler. 'target_conditions': [ ['_toolset=="target"', { @@ -299,7 +299,7 @@ 'V8_TARGET_ARCH_MIPS', ], 'conditions': [ - ['v8_target_arch==target_arch', { + ['v8_target_arch==target_arch and android_webview_build==0', { # Target built with a Mips CXX compiler. 'target_conditions': [ ['_toolset=="target"', { @@ -354,7 +354,7 @@ 'V8_TARGET_ARCH_MIPS64', ], 'conditions': [ - ['v8_target_arch==target_arch', { + ['v8_target_arch==target_arch and android_webview_build==0', { # Target built with a Mips CXX compiler. 'target_conditions': [ ['_toolset=="target"', { -- 2.7.4