summaryrefslogtreecommitdiff
path: root/tools/v8_gypfiles
diff options
context:
space:
mode:
authorMichaël Zasso <targos@protonmail.com>2019-05-31 09:32:19 +0200
committerMichaël Zasso <targos@protonmail.com>2019-08-19 09:26:07 +0200
commitc206e7490cac0b8d44481f4da4d2b24278b00ad0 (patch)
treeccaa89a9eb40bb4bb1cfc5b49d36b41a9427faa5 /tools/v8_gypfiles
parent02132d09262fa3c3e518ffbbb6f04cac68d12abd (diff)
downloadandroid-node-v8-c206e7490cac0b8d44481f4da4d2b24278b00ad0.tar.gz
android-node-v8-c206e7490cac0b8d44481f4da4d2b24278b00ad0.tar.bz2
android-node-v8-c206e7490cac0b8d44481f4da4d2b24278b00ad0.zip
tools: sync gypfiles with V8 7.7
Co-authored-by: Ujjwal Sharma <usharma1998@gmail.com> PR-URL: https://github.com/nodejs/node/pull/28918 Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Jiawen Geng <technicalcute@gmail.com> Reviewed-By: Rich Trott <rtrott@gmail.com>
Diffstat (limited to 'tools/v8_gypfiles')
-rw-r--r--tools/v8_gypfiles/ForEachReplace.py7
-rw-r--r--tools/v8_gypfiles/features.gypi1
-rw-r--r--tools/v8_gypfiles/inspector.gypi39
-rw-r--r--tools/v8_gypfiles/v8.gyp85
4 files changed, 57 insertions, 75 deletions
diff --git a/tools/v8_gypfiles/ForEachReplace.py b/tools/v8_gypfiles/ForEachReplace.py
new file mode 100644
index 0000000000..730487a2ba
--- /dev/null
+++ b/tools/v8_gypfiles/ForEachReplace.py
@@ -0,0 +1,7 @@
+# Copyright (c) 2019 Ujjwal Sharma <usharma1998@gmail>. All rights reserved.
+# Use of this source code is governed by an MIT-style license.
+
+def DoMain(args):
+ old = args.pop(0)
+ new = args.pop(0)
+ return ' '.join(a.replace(old, new) for a in args)
diff --git a/tools/v8_gypfiles/features.gypi b/tools/v8_gypfiles/features.gypi
index a670f3bc80..bcbd9d2268 100644
--- a/tools/v8_gypfiles/features.gypi
+++ b/tools/v8_gypfiles/features.gypi
@@ -253,6 +253,7 @@
'defines': [
'V8_ENABLE_ALLOCATION_TIMEOUT',
'V8_ENABLE_FORCE_SLOW_PATH',
+ 'V8_ENABLE_DOUBLE_CONST_STORE_CHECK',
],
}],
['v8_enable_v8_checks==1', {
diff --git a/tools/v8_gypfiles/inspector.gypi b/tools/v8_gypfiles/inspector.gypi
index 5e89f400ab..562583126d 100644
--- a/tools/v8_gypfiles/inspector.gypi
+++ b/tools/v8_gypfiles/inspector.gypi
@@ -3,11 +3,31 @@
# found in the LICENSE file.
{
- 'includes': [
- '../../deps/v8/third_party/inspector_protocol/inspector_protocol.gypi',
- ],
'variables': {
'inspector_protocol_path': '<(V8_ROOT)/third_party/inspector_protocol',
+ 'inspector_protocol_files': [
+ '<(inspector_protocol_path)/lib/base_string_adapter_cc.template',
+ '<(inspector_protocol_path)/lib/base_string_adapter_h.template',
+ '<(inspector_protocol_path)/lib/DispatcherBase_cpp.template',
+ '<(inspector_protocol_path)/lib/DispatcherBase_h.template',
+ '<(inspector_protocol_path)/lib/ErrorSupport_cpp.template',
+ '<(inspector_protocol_path)/lib/ErrorSupport_h.template',
+ '<(inspector_protocol_path)/lib/Forward_h.template',
+ '<(inspector_protocol_path)/lib/FrontendChannel_h.template',
+ '<(inspector_protocol_path)/lib/Object_cpp.template',
+ '<(inspector_protocol_path)/lib/Object_h.template',
+ '<(inspector_protocol_path)/lib/Parser_cpp.template',
+ '<(inspector_protocol_path)/lib/Parser_h.template',
+ '<(inspector_protocol_path)/lib/Protocol_cpp.template',
+ '<(inspector_protocol_path)/lib/ValueConversions_h.template',
+ '<(inspector_protocol_path)/lib/Values_cpp.template',
+ '<(inspector_protocol_path)/lib/Values_h.template',
+ '<(inspector_protocol_path)/templates/Exported_h.template',
+ '<(inspector_protocol_path)/templates/Imported_h.template',
+ '<(inspector_protocol_path)/templates/TypeBuilder_cpp.template',
+ '<(inspector_protocol_path)/templates/TypeBuilder_h.template',
+ '<(inspector_protocol_path)/code_generator.py',
+ ],
'inspector_path': '<(V8_ROOT)/src/inspector',
'inspector_generated_output_root': '<(SHARED_INTERMEDIATE_DIR)/inspector-generated-output-root',
'inspector_generated_sources': [
@@ -92,16 +112,22 @@
# Flat merge `third_party/inspector_protocol:encoding`
'<(inspector_protocol_path)/encoding/encoding.cc',
'<(inspector_protocol_path)/encoding/encoding.h',
- ]
+ # Flat merge `third_party/inspector_protocol:bindings`
+ '<(inspector_protocol_path)/bindings/bindings.cc',
+ '<(inspector_protocol_path)/bindings/bindings.h',
+
+ ],
+ 'v8_inspector_js_protocol': '<(V8_ROOT)/include/js_protocol.pdl',
},
'include_dirs': [
'<(inspector_generated_output_root)',
+ '<(inspector_protocol_path)',
],
'actions': [
{
'action_name': 'protocol_compatibility',
'inputs': [
- '<(inspector_path)/js_protocol.pdl',
+ '<(v8_inspector_js_protocol)',
],
'outputs': [
'<@(inspector_generated_output_root)/src/js_protocol.stamp',
@@ -117,7 +143,7 @@
{
'action_name': 'protocol_generated_sources',
'inputs': [
- '<(inspector_path)/js_protocol.pdl',
+ '<(v8_inspector_js_protocol)',
'<(inspector_path)/inspector_protocol_config.json',
'<@(inspector_protocol_files)',
],
@@ -131,6 +157,7 @@
'--jinja_dir', '<(V8_ROOT)/third_party',
'--output_base', '<(inspector_generated_output_root)/src/inspector',
'--config', '<(inspector_path)/inspector_protocol_config.json',
+ '--inspector_protocol_dir', '<(inspector_protocol_path)',
],
'message': 'Generating inspector protocol sources from protocol json',
},
diff --git a/tools/v8_gypfiles/v8.gyp b/tools/v8_gypfiles/v8.gyp
index ce33b8cd53..f133aea611 100644
--- a/tools/v8_gypfiles/v8.gyp
+++ b/tools/v8_gypfiles/v8.gyp
@@ -34,6 +34,7 @@
"<(V8_ROOT)/src/builtins/array-unshift.tq",
"<(V8_ROOT)/src/builtins/array.tq",
"<(V8_ROOT)/src/builtins/base.tq",
+ "<(V8_ROOT)/src/builtins/bigint.tq",
"<(V8_ROOT)/src/builtins/boolean.tq",
"<(V8_ROOT)/src/builtins/collections.tq",
"<(V8_ROOT)/src/builtins/data-view.tq",
@@ -44,13 +45,20 @@
"<(V8_ROOT)/src/builtins/iterator.tq",
"<(V8_ROOT)/src/builtins/math.tq",
"<(V8_ROOT)/src/builtins/object-fromentries.tq",
+ "<(V8_ROOT)/src/builtins/object.tq",
"<(V8_ROOT)/src/builtins/proxy-constructor.tq",
+ "<(V8_ROOT)/src/builtins/proxy-delete-property.tq",
"<(V8_ROOT)/src/builtins/proxy-get-property.tq",
+ "<(V8_ROOT)/src/builtins/proxy-get-prototype-of.tq",
"<(V8_ROOT)/src/builtins/proxy-has-property.tq",
+ "<(V8_ROOT)/src/builtins/proxy-is-extensible.tq",
+ "<(V8_ROOT)/src/builtins/proxy-prevent-extensions.tq",
"<(V8_ROOT)/src/builtins/proxy-revocable.tq",
"<(V8_ROOT)/src/builtins/proxy-revoke.tq",
"<(V8_ROOT)/src/builtins/proxy-set-property.tq",
+ "<(V8_ROOT)/src/builtins/proxy-set-prototype-of.tq",
"<(V8_ROOT)/src/builtins/proxy.tq",
+ "<(V8_ROOT)/src/builtins/reflect.tq",
"<(V8_ROOT)/src/builtins/regexp-replace.tq",
"<(V8_ROOT)/src/builtins/regexp.tq",
"<(V8_ROOT)/src/builtins/string.tq",
@@ -74,66 +82,12 @@
"<(V8_ROOT)/src/builtins/typed-array-subarray.tq",
"<(V8_ROOT)/src/builtins/typed-array.tq",
"<(V8_ROOT)/third_party/v8/builtins/array-sort.tq",
- ],
- 'torque_namespaces': [
- "arguments",
- "array",
- "array-copywithin",
- "array-filter",
- "array-find",
- "array-findindex",
- "array-foreach",
- "array-join",
- "array-map",
- "array-of",
- "array-reverse",
- "array-shift",
- "array-slice",
- "array-splice",
- "array-unshift",
- "array-lastindexof",
- "base",
- "boolean",
- "collections",
- "data-view",
- "extras-utils",
- "growable-fixed-array",
- "internal-coverage",
- "iterator",
- "math",
- "object",
- "proxy",
- "regexp",
- "regexp-replace",
- "string",
- "string-html",
- "string-iterator",
- "string-repeat",
- "string-slice",
- "string-substring",
- "typed-array",
- "typed-array-createtypedarray",
- "typed-array-every",
- "typed-array-filter",
- "typed-array-find",
- "typed-array-findindex",
- "typed-array-foreach",
- "typed-array-reduce",
- "typed-array-reduceright",
- "typed-array-slice",
- "typed-array-some",
- "typed-array-subarray",
+ "<(V8_ROOT)/test/torque/test-torque.tq",
],
'torque_output_root': '<(SHARED_INTERMEDIATE_DIR)/torque-output-root',
- # Since there is no foreach in GYP we use `ForEachFormat` to unroll the following:
- # foreach(namespace, torque_namespaces) {
- # outputs += [
- # "$target_gen_dir/torque-generated/builtins-$namespace-gen-tq.cc",
- # "$target_gen_dir/torque-generated/builtins-$namespace-gen-tq.h",
- # ]
- # }
- 'torque_outputs': ['<!@pymod_do_main(ForEachFormat "<(torque_output_root)/torque-generated/builtins-%s-gen-tq.cc" <@(torque_namespaces))'],
- 'torque_outputs+': ['<!@pymod_do_main(ForEachFormat "<(torque_output_root)/torque-generated/builtins-%s-gen-tq.h" <@(torque_namespaces))'],
+ 'torque_files_replaced': ['<!@pymod_do_main(ForEachReplace ".tq" "-tq-csa" <@(torque_files))'],
+ 'torque_outputs': ['<!@pymod_do_main(ForEachFormat "<(torque_output_root)/torque-generated/%s.cc" <@(torque_files_replaced))'],
+ 'torque_outputs+': ['<!@pymod_do_main(ForEachFormat "<(torque_output_root)/torque-generated/%s.h" <@(torque_files_replaced))'],
'v8_compiler_sources': ['<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "v8_compiler_sources = ")'],
'conditions': [
@@ -182,11 +136,13 @@
'<(torque_output_root)/torque-generated/exported-macros-assembler-tq.cc',
'<(torque_output_root)/torque-generated/exported-macros-assembler-tq.h',
'<(torque_output_root)/torque-generated/csa-types-tq.h',
+ '<(torque_output_root)/torque-generated/instance-types-tq.h',
'<@(torque_outputs)',
],
'action': [
'<@(_inputs)',
- '-o', '<(torque_output_root)/torque-generated'
+ '-o', '<(torque_output_root)/torque-generated',
+ '-v8-root', '<(V8_ROOT)'
],
},
],
@@ -1237,16 +1193,7 @@
'sources': [
'<(V8_ROOT)/src/libplatform/tracing/json-trace-event-listener.cc',
'<(V8_ROOT)/src/libplatform/tracing/json-trace-event-listener.h',
- '<(V8_ROOT)/src/libplatform/tracing/perfetto-consumer.cc',
- '<(V8_ROOT)/src/libplatform/tracing/perfetto-consumer.h',
- '<(V8_ROOT)/src/libplatform/tracing/perfetto-producer.cc',
- '<(V8_ROOT)/src/libplatform/tracing/perfetto-producer.h',
- '<(V8_ROOT)/src/libplatform/tracing/perfetto-shared-memory.cc',
- '<(V8_ROOT)/src/libplatform/tracing/perfetto-shared-memory.h',
- '<(V8_ROOT)/src/libplatform/tracing/perfetto-tasks.cc',
- '<(V8_ROOT)/src/libplatform/tracing/perfetto-tasks.h',
- '<(V8_ROOT)/src/libplatform/tracing/perfetto-tracing-controller.cc',
- '<(V8_ROOT)/src/libplatform/tracing/perfetto-tracing-controller.h',
+ '<(V8_ROOT)/src/libplatform/tracing/trace-event-listener.cc',
'<(V8_ROOT)/src/libplatform/tracing/trace-event-listener.h',
],
'dependencies': [