Commit 3b217d42 authored by ivica.bogosavljevic's avatar ivica.bogosavljevic Committed by Commit bot

[inspector] Fix double rules warning when compiling inspector with GYP

When cross compiling inspector with GYP on MIPS and ARM, there are three
rules that generate the same file both host toolset and target toolset.
This causes problems because of rule duplication; depending on
compilation configuration this can cause warning or error.
We fix this by disabling the host rule and using target rule for all
depending rules.

BUG=v8:6176

Review-Url: https://codereview.chromium.org/2819283005
Cr-Commit-Position: refs/heads/master@{#44741}
parent 43fd247c
......@@ -13,13 +13,7 @@
'targets': [
{ 'target_name': 'inspector_injected_script',
'type': 'none',
'conditions': [
['want_separate_host_toolset==1', {
'toolsets': ['host', 'target'],
}, {
'toolsets': ['target'],
}]
],
'toolsets': ['target'],
'actions': [
{
'action_name': 'convert_js_to_cpp_char_array',
......@@ -44,13 +38,7 @@
},
{ 'target_name': 'inspector_debugger_script',
'type': 'none',
'conditions': [
['want_separate_host_toolset==1', {
'toolsets': ['host', 'target'],
}, {
'toolsets': ['target'],
}]
],
'toolsets': ['target'],
'actions': [
{
'action_name': 'convert_js_to_cpp_char_array',
......@@ -75,13 +63,7 @@
},
{ 'target_name': 'protocol_compatibility',
'type': 'none',
'conditions': [
['want_separate_host_toolset==1', {
'toolsets': ['host', 'target'],
}, {
'toolsets': ['target'],
}]
],
'toolsets': ['target'],
'actions': [
{
'action_name': 'protocol_compatibility',
......@@ -104,13 +86,7 @@
{ 'target_name': 'protocol_generated_sources',
'type': 'none',
'dependencies': [ 'protocol_compatibility' ],
'conditions': [
['want_separate_host_toolset==1', {
'toolsets': ['host', 'target'],
}, {
'toolsets': ['target'],
}]
],
'toolsets': ['target'],
'actions': [
{
'action_name': 'protocol_generated_sources',
......
......@@ -369,9 +369,9 @@
'dependencies': [
'v8_libbase',
'v8_libsampler',
'inspector/inspector.gyp:protocol_generated_sources',
'inspector/inspector.gyp:inspector_injected_script',
'inspector/inspector.gyp:inspector_debugger_script',
'inspector/inspector.gyp:protocol_generated_sources#target',
'inspector/inspector.gyp:inspector_injected_script#target',
'inspector/inspector.gyp:inspector_debugger_script#target',
],
'objs': ['foo.o'],
'variables': {
......
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