Revision: 21428
Author: [email protected]
Date: Thu May 22 09:04:24 2014 UTC
Log: Revert "Rename target-specific binaries built for host."
The Android build system support for gyp has been fixed to handle
target-dependent host binaries correctly without requiring them to
include the target architecture in the name. Remove the suffixes to make
referring to these targets simpler again.
This reverts r14209.
BUG=
[email protected]
Review URL: https://codereview.chromium.org/236833004
Patch from Richard Coles <[email protected]>.
http://code.google.com/p/v8/source/detail?r=21428
Modified:
/branches/bleeding_edge/test/cctest/cctest.gyp
/branches/bleeding_edge/tools/gyp/v8.gyp
=======================================
--- /branches/bleeding_edge/test/cctest/cctest.gyp Wed May 14 16:34:13 2014
UTC
+++ /branches/bleeding_edge/test/cctest/cctest.gyp Thu May 22 09:04:24 2014
UTC
@@ -205,7 +205,7 @@
},
{
'dependencies': [
- '../../tools/gyp/v8.gyp:v8_nosnapshot.<(v8_target_arch)',
+ '../../tools/gyp/v8.gyp:v8_nosnapshot',
],
}],
],
=======================================
--- /branches/bleeding_edge/tools/gyp/v8.gyp Fri May 16 15:18:24 2014 UTC
+++ /branches/bleeding_edge/tools/gyp/v8.gyp Thu May 22 09:04:24 2014 UTC
@@ -46,16 +46,13 @@
# 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_target_arch)', 'v8_snapshot'],
+ 'dependencies': ['v8_base', '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_target_arch)',
- 'v8_nosnapshot.<(v8_target_arch)',
- ],
+ 'dependencies': ['v8_base', 'v8_nosnapshot'],
}],
['component=="shared_library"', {
'type': '<(component)',
@@ -112,14 +109,14 @@
['want_separate_host_toolset==1', {
'toolsets': ['host', 'target'],
'dependencies': [
- 'mksnapshot.<(v8_target_arch)#host',
+ 'mksnapshot#host',
'js2c#host',
'generate_trig_table#host',
],
}, {
'toolsets': ['target'],
'dependencies': [
- 'mksnapshot.<(v8_target_arch)',
+ 'mksnapshot',
'js2c',
'generate_trig_table',
],
@@ -138,7 +135,7 @@
}],
],
'dependencies': [
- 'v8_base.<(v8_target_arch)',
+ 'v8_base',
],
'include_dirs+': [
'../../src',
@@ -153,7 +150,7 @@
{
'action_name': 'run_mksnapshot',
'inputs': [
-
'<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot.<(v8_target_arch)<(EXECUTABLE_SUFFIX)',
+
'<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot<(EXECUTABLE_SUFFIX)',
],
'outputs': [
'<(INTERMEDIATE_DIR)/snapshot.cc',
@@ -178,10 +175,10 @@
],
},
{
- 'target_name': 'v8_nosnapshot.<(v8_target_arch)',
+ 'target_name': 'v8_nosnapshot',
'type': 'static_library',
'dependencies': [
- 'v8_base.<(v8_target_arch)',
+ 'v8_base',
],
'include_dirs+': [
'../../src',
@@ -235,7 +232,7 @@
]
},
{
- 'target_name': 'v8_base.<(v8_target_arch)',
+ 'target_name': 'v8_base',
'type': 'static_library',
'dependencies': [
'v8_libbase.<(v8_target_arch)',
@@ -1176,12 +1173,9 @@
]
},
{
- 'target_name': 'mksnapshot.<(v8_target_arch)',
+ 'target_name': 'mksnapshot',
'type': 'executable',
- 'dependencies': [
- 'v8_base.<(v8_target_arch)',
- 'v8_nosnapshot.<(v8_target_arch)',
- ],
+ 'dependencies': ['v8_base', 'v8_nosnapshot'],
'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/d/optout.
