AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

Fix the android_webview build's gyp files after the changes in r22444.

Browse Source 
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
This commit is contained in:
rmcilroy@chromium.org 2014-07-18 10:17:01 +00:00
parent 38cb7830aa
commit 9d5bd59204
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
build/toolchain.gypi
View File

@ -143,7 +143,7 @@
'target_conditions': [ 'target_conditions': [
['_toolset=="host"', { ['_toolset=="host"', {
'conditions': [ 'conditions': [
['v8_target_arch==host_arch', { ['v8_target_arch==host_arch and android_webview_build==0', {
# Host built with an Arm CXX compiler. # Host built with an Arm CXX compiler.
'conditions': [ 'conditions': [
[ 'arm_version==7', { [ 'arm_version==7', {
@ -186,7 +186,7 @@
}], # _toolset=="host" }], # _toolset=="host"
['_toolset=="target"', { ['_toolset=="target"', {
'conditions': [ 'conditions': [
['v8_target_arch==target_arch', { ['v8_target_arch==target_arch and android_webview_build==0', {
# Target built with an Arm CXX compiler. # Target built with an Arm CXX compiler.
'conditions': [ 'conditions': [
[ 'arm_version==7', { [ 'arm_version==7', {
@ -250,7 +250,7 @@
'V8_TARGET_ARCH_MIPS', 'V8_TARGET_ARCH_MIPS',
], ],
'conditions': [ 'conditions': [
['v8_target_arch==target_arch', { ['v8_target_arch==target_arch and android_webview_build==0', {
# Target built with a Mips CXX compiler. # Target built with a Mips CXX compiler.
'target_conditions': [ 'target_conditions': [
['_toolset=="target"', { ['_toolset=="target"', {
@ -299,7 +299,7 @@
'V8_TARGET_ARCH_MIPS', 'V8_TARGET_ARCH_MIPS',
], ],
'conditions': [ 'conditions': [
['v8_target_arch==target_arch', { ['v8_target_arch==target_arch and android_webview_build==0', {
# Target built with a Mips CXX compiler. # Target built with a Mips CXX compiler.
'target_conditions': [ 'target_conditions': [
['_toolset=="target"', { ['_toolset=="target"', {
@ -354,7 +354,7 @@
'V8_TARGET_ARCH_MIPS64', 'V8_TARGET_ARCH_MIPS64',
], ],
'conditions': [ 'conditions': [
['v8_target_arch==target_arch', { ['v8_target_arch==target_arch and android_webview_build==0', {
# Target built with a Mips CXX compiler. # Target built with a Mips CXX compiler.
'target_conditions': [ 'target_conditions': [
['_toolset=="target"', { ['_toolset=="target"', {