Skip to content

Commit a9d644c

Browse files
committed
build,v8: fix gyp target race
Merge `protocol_generated_sources` & `inspector_injected_script#target` into serial actions in the same target
1 parent e9aef43 commit a9d644c

File tree

3 files changed

+19
-36
lines changed

3 files changed

+19
-36
lines changed

common.gypi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
# Reset this number to 0 on major V8 upgrades.
3131
# Increment by one for each non-official patch applied to deps/v8.
32-
'v8_embedder_string': '-node.26',
32+
'v8_embedder_string': '-node.27',
3333

3434
# Enable disassembler for `--print-code` v8 options
3535
'v8_enable_disassembler': 1,

deps/v8/gypfiles/inspector.gyp

Lines changed: 18 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -14,32 +14,6 @@
1414
'targets': [
1515
{ 'target_name': 'inspector_injected_script',
1616
'type': 'none',
17-
'toolsets': ['target'],
18-
'actions': [
19-
{
20-
'action_name': 'convert_js_to_cpp_char_array',
21-
'inputs': [
22-
'<(inspector_path)/build/xxd.py',
23-
'<(inspector_injected_script_source)',
24-
],
25-
'outputs': [
26-
'<(inspector_generated_injected_script)',
27-
],
28-
'action': [
29-
'python',
30-
'<(inspector_path)/build/xxd.py',
31-
'InjectedScriptSource_js',
32-
'<(inspector_path)/injected-script-source.js',
33-
'<@(_outputs)'
34-
],
35-
},
36-
],
37-
# Since this target generates header files, it needs to be a hard dependency.
38-
'hard_dependency': 1,
39-
},
40-
{ 'target_name': 'protocol_compatibility',
41-
'type': 'none',
42-
'toolsets': ['target'],
4317
'actions': [
4418
{
4519
'action_name': 'protocol_compatibility',
@@ -55,15 +29,8 @@
5529
'--stamp', '<@(_outputs)',
5630
'<(inspector_path)/js_protocol.json',
5731
],
58-
'message': 'Generating inspector protocol sources from protocol json definition',
32+
'message': 'Checking inspector protocol compatibility',
5933
},
60-
]
61-
},
62-
{ 'target_name': 'protocol_generated_sources',
63-
'type': 'none',
64-
'dependencies': [ 'protocol_compatibility' ],
65-
'toolsets': ['target'],
66-
'actions': [
6734
{
6835
'action_name': 'protocol_generated_sources',
6936
'inputs': [
@@ -83,6 +50,23 @@
8350
],
8451
'message': 'Generating inspector protocol sources from protocol json',
8552
},
53+
{
54+
'action_name': 'convert_js_to_cpp_char_array',
55+
'inputs': [
56+
'<(inspector_path)/build/xxd.py',
57+
'<(inspector_injected_script_source)',
58+
],
59+
'outputs': [
60+
'<(inspector_generated_injected_script)',
61+
],
62+
'action': [
63+
'python',
64+
'<(inspector_path)/build/xxd.py',
65+
'InjectedScriptSource_js',
66+
'<(inspector_path)/injected-script-source.js',
67+
'<@(_outputs)'
68+
],
69+
},
8670
]
8771
},
8872
],

deps/v8/gypfiles/v8.gyp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -518,7 +518,6 @@
518518
'v8_libbase',
519519
'v8_libsampler',
520520
'v8_torque#host',
521-
'inspector.gyp:protocol_generated_sources#target',
522521
'inspector.gyp:inspector_injected_script#target',
523522
],
524523
'direct_dependent_settings': {

0 commit comments

Comments
 (0)