Revision: 22467
Author: [email protected]
Date: Fri Jul 18 10:17:01 2014 UTC
Log: 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.
[email protected]
Review URL: https://codereview.chromium.org/399413002
http://code.google.com/p/v8/source/detail?r=22467
Modified:
/branches/bleeding_edge/build/toolchain.gypi
=======================================
--- /branches/bleeding_edge/build/toolchain.gypi Thu Jul 17 09:56:58 2014
UTC
+++ /branches/bleeding_edge/build/toolchain.gypi Fri Jul 18 10:17:01 2014
UTC
@@ -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"', {
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
