Remove use_system_v8 logic from the mainline gyp file

Re-upload of https://codereview.chromium.org/14872005/

BUG=chromium:226860
R=ulan@chromium.org

Review URL: https://codereview.chromium.org/15001031

Patch from Paweł Hajdan Jr. <phajdan.jr@chromium.org>.

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@14682 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
parent 3d5b8009
......@@ -29,7 +29,6 @@
{
'variables': {
'use_system_v8%': 0,
'msvs_use_common_release': 0,
'gcc_version%': 'unknown',
'CXX%': '${CXX:-$(which g++)}', # Used to assemble a shell command.
......
......@@ -27,8 +27,6 @@
{
'includes': ['../../build/common.gypi'],
'conditions': [
['use_system_v8==0', {
'targets': [
{
'target_name': 'v8',
......@@ -925,80 +923,4 @@
],
},
],
}, { # use_system_v8 != 0
'targets': [
{
'target_name': 'v8',
'type': 'none',
'conditions': [
['want_separate_host_toolset==1', {
'toolsets': ['host', 'target'],
}, {
'toolsets': ['target'],
}],
],
'variables': {
'shim_headers_path': '<(SHARED_INTERMEDIATE_DIR)/shim_headers/<(_target_name)/<(_toolset)',
},
'include_dirs++': [
'<(shim_headers_path)',
],
'all_dependent_settings': {
'include_dirs+++': [
'<(shim_headers_path)',
],
},
'actions': [
{
'variables': {
'generator_path': '../../../tools/generate_shim_headers/generate_shim_headers.py',
'generator_args': [
'--headers-root', '../../include',
'--output-directory', '<(shim_headers_path)',
'v8-debug.h',
'v8-preparser.h',
'v8-profiler.h',
'v8-testing.h',
'v8.h',
'v8stdint.h',
],
},
'action_name': 'generate_<(_target_name)_shim_headers',
'inputs': [
'<(generator_path)',
],
'outputs': [
'<!@pymod_do_main(generate_shim_headers <@(generator_args) --outputs)',
],
'action': ['python',
'<(generator_path)',
'<@(generator_args)',
'--generate',
],
'message': 'Generating <(_target_name) shim headers.',
},
],
'link_settings': {
'libraries': [
'-lv8',
],
},
},
{
'target_name': 'v8_shell',
'type': 'none',
'conditions': [
['want_separate_host_toolset==1', {
'toolsets': ['host'],
}, {
'toolsets': ['target'],
}],
],
'dependencies': [
'v8'
],
},
],
}],
],
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment