Skip to content

Commit 3d8b844

Browse files
refackrefack
committed
deps,build: move gypfiles out 1/2 - required changes
* Add `<(V8_ROOT)` to file paths PR-URL: #26685 Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Michaël Zasso <[email protected]> Reviewed-By: Refael Ackermann <[email protected]>
1 parent fff922a commit 3d8b844

File tree

4 files changed

+1873
-1877
lines changed

4 files changed

+1873
-1877
lines changed

‎deps/v8/gypfiles/inspector.gypi

+56-56
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
{
66
'variables': {
7-
'inspector_protocol_path': '../third_party/inspector_protocol',
8-
'inspector_path': '../src/inspector',
7+
'inspector_protocol_path': '<(V8_ROOT)/third_party/inspector_protocol',
8+
'inspector_path': '<(V8_ROOT)/src/inspector',
99
'inspector_generated_output_root': '<(SHARED_INTERMEDIATE_DIR)/inspector-generated-output-root',
1010
'inspector_generated_sources': [
1111
'<(inspector_generated_output_root)/src/inspector/protocol/Forward.h',
@@ -29,62 +29,62 @@
2929
],
3030

3131
'inspector_all_sources': [
32-
'../include/v8-inspector.h',
33-
'../include/v8-inspector-protocol.h',
34-
'../src/inspector/custom-preview.cc',
35-
'../src/inspector/custom-preview.h',
36-
'../src/inspector/injected-script.cc',
37-
'../src/inspector/injected-script.h',
38-
'../src/inspector/inspected-context.cc',
39-
'../src/inspector/inspected-context.h',
40-
'../src/inspector/remote-object-id.cc',
41-
'../src/inspector/remote-object-id.h',
42-
'../src/inspector/search-util.cc',
43-
'../src/inspector/search-util.h',
44-
'../src/inspector/string-16.cc',
45-
'../src/inspector/string-16.h',
46-
'../src/inspector/string-util.cc',
47-
'../src/inspector/string-util.h',
48-
'../src/inspector/test-interface.cc',
49-
'../src/inspector/test-interface.h',
50-
'../src/inspector/v8-console.cc',
51-
'../src/inspector/v8-console.h',
52-
'../src/inspector/v8-console-agent-impl.cc',
53-
'../src/inspector/v8-console-agent-impl.h',
54-
'../src/inspector/v8-console-message.cc',
55-
'../src/inspector/v8-console-message.h',
56-
'../src/inspector/v8-debugger.cc',
57-
'../src/inspector/v8-debugger.h',
58-
'../src/inspector/v8-debugger-agent-impl.cc',
59-
'../src/inspector/v8-debugger-agent-impl.h',
60-
'../src/inspector/v8-debugger-script.cc',
61-
'../src/inspector/v8-debugger-script.h',
62-
'../src/inspector/v8-heap-profiler-agent-impl.cc',
63-
'../src/inspector/v8-heap-profiler-agent-impl.h',
64-
'../src/inspector/v8-inspector-impl.cc',
65-
'../src/inspector/v8-inspector-impl.h',
66-
'../src/inspector/v8-inspector-session-impl.cc',
67-
'../src/inspector/v8-inspector-session-impl.h',
68-
'../src/inspector/v8-profiler-agent-impl.cc',
69-
'../src/inspector/v8-profiler-agent-impl.h',
70-
'../src/inspector/v8-regex.cc',
71-
'../src/inspector/v8-regex.h',
72-
'../src/inspector/v8-runtime-agent-impl.cc',
73-
'../src/inspector/v8-runtime-agent-impl.h',
74-
'../src/inspector/v8-schema-agent-impl.cc',
75-
'../src/inspector/v8-schema-agent-impl.h',
76-
'../src/inspector/v8-stack-trace-impl.cc',
77-
'../src/inspector/v8-stack-trace-impl.h',
78-
'../src/inspector/v8-value-utils.cc',
79-
'../src/inspector/v8-value-utils.h',
80-
'../src/inspector/value-mirror.cc',
81-
'../src/inspector/value-mirror.h',
82-
'../src/inspector/wasm-translation.cc',
83-
'../src/inspector/wasm-translation.h',
32+
'<(V8_ROOT)/include/v8-inspector.h',
33+
'<(V8_ROOT)/include/v8-inspector-protocol.h',
34+
'<(V8_ROOT)/src/inspector/custom-preview.cc',
35+
'<(V8_ROOT)/src/inspector/custom-preview.h',
36+
'<(V8_ROOT)/src/inspector/injected-script.cc',
37+
'<(V8_ROOT)/src/inspector/injected-script.h',
38+
'<(V8_ROOT)/src/inspector/inspected-context.cc',
39+
'<(V8_ROOT)/src/inspector/inspected-context.h',
40+
'<(V8_ROOT)/src/inspector/remote-object-id.cc',
41+
'<(V8_ROOT)/src/inspector/remote-object-id.h',
42+
'<(V8_ROOT)/src/inspector/search-util.cc',
43+
'<(V8_ROOT)/src/inspector/search-util.h',
44+
'<(V8_ROOT)/src/inspector/string-16.cc',
45+
'<(V8_ROOT)/src/inspector/string-16.h',
46+
'<(V8_ROOT)/src/inspector/string-util.cc',
47+
'<(V8_ROOT)/src/inspector/string-util.h',
48+
'<(V8_ROOT)/src/inspector/test-interface.cc',
49+
'<(V8_ROOT)/src/inspector/test-interface.h',
50+
'<(V8_ROOT)/src/inspector/v8-console.cc',
51+
'<(V8_ROOT)/src/inspector/v8-console.h',
52+
'<(V8_ROOT)/src/inspector/v8-console-agent-impl.cc',
53+
'<(V8_ROOT)/src/inspector/v8-console-agent-impl.h',
54+
'<(V8_ROOT)/src/inspector/v8-console-message.cc',
55+
'<(V8_ROOT)/src/inspector/v8-console-message.h',
56+
'<(V8_ROOT)/src/inspector/v8-debugger.cc',
57+
'<(V8_ROOT)/src/inspector/v8-debugger.h',
58+
'<(V8_ROOT)/src/inspector/v8-debugger-agent-impl.cc',
59+
'<(V8_ROOT)/src/inspector/v8-debugger-agent-impl.h',
60+
'<(V8_ROOT)/src/inspector/v8-debugger-script.cc',
61+
'<(V8_ROOT)/src/inspector/v8-debugger-script.h',
62+
'<(V8_ROOT)/src/inspector/v8-heap-profiler-agent-impl.cc',
63+
'<(V8_ROOT)/src/inspector/v8-heap-profiler-agent-impl.h',
64+
'<(V8_ROOT)/src/inspector/v8-inspector-impl.cc',
65+
'<(V8_ROOT)/src/inspector/v8-inspector-impl.h',
66+
'<(V8_ROOT)/src/inspector/v8-inspector-session-impl.cc',
67+
'<(V8_ROOT)/src/inspector/v8-inspector-session-impl.h',
68+
'<(V8_ROOT)/src/inspector/v8-profiler-agent-impl.cc',
69+
'<(V8_ROOT)/src/inspector/v8-profiler-agent-impl.h',
70+
'<(V8_ROOT)/src/inspector/v8-regex.cc',
71+
'<(V8_ROOT)/src/inspector/v8-regex.h',
72+
'<(V8_ROOT)/src/inspector/v8-runtime-agent-impl.cc',
73+
'<(V8_ROOT)/src/inspector/v8-runtime-agent-impl.h',
74+
'<(V8_ROOT)/src/inspector/v8-schema-agent-impl.cc',
75+
'<(V8_ROOT)/src/inspector/v8-schema-agent-impl.h',
76+
'<(V8_ROOT)/src/inspector/v8-stack-trace-impl.cc',
77+
'<(V8_ROOT)/src/inspector/v8-stack-trace-impl.h',
78+
'<(V8_ROOT)/src/inspector/v8-value-utils.cc',
79+
'<(V8_ROOT)/src/inspector/v8-value-utils.h',
80+
'<(V8_ROOT)/src/inspector/value-mirror.cc',
81+
'<(V8_ROOT)/src/inspector/value-mirror.h',
82+
'<(V8_ROOT)/src/inspector/wasm-translation.cc',
83+
'<(V8_ROOT)/src/inspector/wasm-translation.h',
8484
]
8585
},
8686
'includes': [
87-
'../third_party/inspector_protocol/inspector_protocol.gypi',
87+
'<(V8_ROOT)/third_party/inspector_protocol/inspector_protocol.gypi',
8888
],
8989
'include_dirs': [
9090
'<(inspector_generated_output_root)',
@@ -120,7 +120,7 @@
120120
'action': [
121121
'python',
122122
'<(inspector_protocol_path)/code_generator.py',
123-
'--jinja_dir', '../third_party',
123+
'--jinja_dir', '<(V8_ROOT)/third_party',
124124
'--output_base', '<(inspector_generated_output_root)/src/inspector',
125125
'--config', '<(inspector_path)/inspector_protocol_config.json',
126126
],

‎deps/v8/gypfiles/toolchain.gypi

+3-3
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
'has_valgrind%': 0,
4242
'coverage%': 0,
4343
'v8_target_arch%': '<(target_arch)',
44-
'v8_host_byteorder%': '<!(python -c "import sys; print sys.byteorder")',
44+
'v8_host_byteorder%': '<!(python -c "import sys; print(sys.byteorder)")',
4545
'force_dynamic_crt%': 0,
4646

4747
# Setting 'v8_can_use_vfp32dregs' to 'true' will cause V8 to use the VFP
@@ -162,8 +162,8 @@
162162
],
163163
'target_defaults': {
164164
'include_dirs': [
165-
'..',
166-
'../include',
165+
'<(V8_ROOT)',
166+
'<(V8_ROOT)/include',
167167
],
168168
'conditions': [
169169
['v8_target_arch=="arm"', {

0 commit comments

Comments
 (0)