Revision: 14209
Author: [email protected]
Date: Wed Apr 10 03:42:54 2013
Log: Rename target-specific binaries built for host.
Rename v8_base, v8_nosnapshot, and mksnapshot to include a suffix of
.<(v8_target_arch). This allows multiple target architectures to be
built in the Android build system, which uses a single shared directory
structure for building host binaries.
BUG=
Review URL: https://codereview.chromium.org/12790011
Patch from Richard Coles <[email protected]>.
http://code.google.com/p/v8/source/detail?r=14209
Modified:
/branches/bleeding_edge/tools/gyp/v8.gyp
=======================================
--- /branches/bleeding_edge/tools/gyp/v8.gyp Thu Mar 28 05:50:18 2013
+++ /branches/bleeding_edge/tools/gyp/v8.gyp Wed Apr 10 03:42:54 2013
@@ -43,13 +43,16 @@
# The dependency on v8_base should come from a transitive
# dependency however the Android toolchain requires
libv8_base.a
# to appear before libv8_snapshot.a so it's listed
explicitly.
- 'dependencies': ['v8_base', 'v8_snapshot'],
+ 'dependencies': ['v8_base.<(v8_target_arch)', 'v8_snapshot'],
},
{
# The dependency on v8_base should come from a transitive
# dependency however the Android toolchain requires
libv8_base.a
# to appear before libv8_snapshot.a so it's listed
explicitly.
- 'dependencies': ['v8_base', 'v8_nosnapshot'],
+ 'dependencies': [
+ 'v8_base.<(v8_target_arch)',
+ 'v8_nosnapshot.<(v8_target_arch)',
+ ],
}],
['component=="shared_library"', {
'type': '<(component)',
@@ -105,10 +108,13 @@
'conditions': [
['want_separate_host_toolset==1', {
'toolsets': ['host', 'target'],
- 'dependencies': ['mksnapshot#host', 'js2c#host'],
+ 'dependencies': [
+ 'mksnapshot.<(v8_target_arch)#host',
+ 'js2c#host',
+ ],
}, {
'toolsets': ['target'],
- 'dependencies': ['mksnapshot', 'js2c'],
+ 'dependencies': ['mksnapshot.<(v8_target_arch)', 'js2c'],
}],
['component=="shared_library"', {
'defines': [
@@ -124,7 +130,7 @@
}],
],
'dependencies': [
- 'v8_base',
+ 'v8_base.<(v8_target_arch)',
],
'include_dirs+': [
'../../src',
@@ -138,7 +144,7 @@
{
'action_name': 'run_mksnapshot',
'inputs': [
-
'<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot<(EXECUTABLE_SUFFIX)',
+
'<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot.<(v8_target_arch)<(EXECUTABLE_SUFFIX)',
],
'outputs': [
'<(INTERMEDIATE_DIR)/snapshot.cc',
@@ -192,10 +198,10 @@
],
},
{
- 'target_name': 'v8_nosnapshot',
+ 'target_name': 'v8_nosnapshot.<(v8_target_arch)',
'type': 'static_library',
'dependencies': [
- 'v8_base',
+ 'v8_base.<(v8_target_arch)',
],
'include_dirs+': [
'../../src',
@@ -222,7 +228,7 @@
]
},
{
- 'target_name': 'v8_base',
+ 'target_name': 'v8_base.<(v8_target_arch)',
'type': 'static_library',
'variables': {
'optimize': 'max',
@@ -869,11 +875,11 @@
]
},
{
- 'target_name': 'mksnapshot',
+ 'target_name': 'mksnapshot.<(v8_target_arch)',
'type': 'executable',
'dependencies': [
- 'v8_base',
- 'v8_nosnapshot',
+ 'v8_base.<(v8_target_arch)',
+ 'v8_nosnapshot.<(v8_target_arch)',
],
'include_dirs+': [
'../../src',
--
--
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/groups/opt_out.
