Reviewers: Jakob,
Message:
Hi Jakob,
I'd like to undo the change I made some time ago to include the target
architecture in the names of the v8 targets; I've since fixed the
gyp-android
backend to not require this any more, and it makes it difficult to write
downstream Android modules that depend on V8 because you have to refer to
different things depending on the architecture.
If this is okay, can you land it for me? :)
Description:
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=
Please review this at https://codereview.chromium.org/236833004/
SVN Base: git://github.com/v8/v8.git@master
Affected files (+12, -18 lines):
M test/cctest/cctest.gyp
M tools/gyp/v8.gyp
Index: test/cctest/cctest.gyp
diff --git a/test/cctest/cctest.gyp b/test/cctest/cctest.gyp
index
eba0580ca58ce31c91c588707f217359e5698dda..6b6e44895a8fbfc36324eb5bf1d06288c8b5cb15
100644
--- a/test/cctest/cctest.gyp
+++ b/test/cctest/cctest.gyp
@@ -206,7 +206,7 @@
},
{
'dependencies': [
- '../../tools/gyp/v8.gyp:v8_nosnapshot.<(v8_target_arch)',
+ '../../tools/gyp/v8.gyp:v8_nosnapshot',
],
}],
],
Index: tools/gyp/v8.gyp
diff --git a/tools/gyp/v8.gyp b/tools/gyp/v8.gyp
index
81b12126e7cdbe712715cd49590808a2eca32ace..6d12be973c4f765391f15d7f4070d73064e1bb25
100644
--- a/tools/gyp/v8.gyp
+++ b/tools/gyp/v8.gyp
@@ -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',
'variables': {
'optimize': 'max',
@@ -1162,12 +1159,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.
