OSSForks/node
1
0
Fork 0
mirror of https://github.com/zebrajr/node.git synced 2025-12-06 00:20:08 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

deps: V8: backport 1b1eda0876aa

Browse Source 
Original commit message:

    tracing: Update proto library build rule and roll Perfetto

    This patch removes use of the deprecated sources_assignment_filter GN
    feature from gni/proto_library.gni, since the extra descriptor files are
    no longer being generated.

    We also roll Perfetto to match the version used in Chrome and update
    test expectations accordingly.

    Bug: v8:10995
    Change-Id: I65cb3b79feb6e5a7e5c8d99fdb8bf999a6048539
    Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2454079
    Commit-Queue: Michael Achenbach <machenbach@chromium.org>
    Auto-Submit: Sami Kyöstilä <skyostil@chromium.org>
    Reviewed-by: Peter Marshall <petermarshall@chromium.org>
    Reviewed-by: Michael Achenbach <machenbach@chromium.org>
    Cr-Commit-Position: refs/heads/master@{#70381}

Refs: 1b1eda0876

PR-URL: https://github.com/nodejs/node/pull/39245
Refs: https://github.com/nodejs/build/issues/2696
Reviewed-By: Richard Lau <rlau@redhat.com>
This commit is contained in:
Michaël Zasso 2021-07-03 11:57:07 +02:00 committed by Richard Lau
parent 93a1a3c5ae
commit bbceab4d91
No known key found for this signature in database
GPG Key ID: C43CEC45C17AB93C
4 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common.gypi
View File

@ -34,7 +34,7 @@
# Reset this number to 0 on major V8 upgrades.
# Increment by one for each non-official patch applied to deps/v8.
'v8_embedder_string': '-node.47',
'v8_embedder_string': '-node.48',
##### V8 defaults for Node.js #####

2
deps/v8/DEPS vendored
View File

@ -246,7 +246,7 @@ deps = {
'dep_type': 'cipd',
},
'v8/third_party/perfetto':
Var('android_url') + '/platform/external/perfetto.git' + '@' + '01615892494a9a8dc84414962d0a817bf97de2c2',
Var('android_url') + '/platform/external/perfetto.git' + '@' + '7cdc44f903d3bcfd1d0f67188bfa797a24756868',
'v8/third_party/protobuf':
Var('chromium_url') + '/external/github.com/google/protobuf'+ '@' + 'b68a347f56137b4b1a746e8c7438495a6ac1bd91',
}

11
deps/v8/gni/proto_library.gni vendored
View File

@ -11,8 +11,6 @@ template("proto_library") {
assert(defined(invoker.sources))
proto_sources = invoker.sources
set_sources_assignment_filter([])
if (host_os == "win") {
host_executable_suffix = ".exe"
} else {
@ -137,6 +135,12 @@ template("proto_library") {
]
}
if (defined(invoker.import_dirs)) {
foreach(path, invoker.import_dirs) {
args += [ "--import-dir=" + rebase_path(path, root_build_dir) ]
}
}
if (generate_with_plugin) {
plugin_path_rebased = rebase_path(plugin_path, root_build_dir)
plugin_out_args = ""
@ -187,10 +191,7 @@ template("proto_library") {
"visibility",
])
# Exclude the config.descriptor file which is an output for some reason.
set_sources_assignment_filter([ "*.descriptor" ])
sources = get_target_outputs(":$action_name")
set_sources_assignment_filter(sources_assignment_filter)
# configs -= [ "//gn/standalone:extra_warnings" ]
if (defined(invoker.extra_configs)) {

9
deps/v8/test/cctest/libplatform/test-tracing.cc vendored
View File

@ -891,10 +891,11 @@ TEST(JsonIntegrationTest) {
std::vector<std::string> all_args;
GetJSONStrings(&all_args, json, "\"args\"", "{", "}");
CHECK_EQ("\"1\":1e+100", all_args[0]);
CHECK_EQ("\"2\":\"NaN\"", all_args[1]);
CHECK_EQ("\"3\":\"Infinity\"", all_args[2]);
CHECK_EQ("\"4\":\"-Infinity\"", all_args[3]);
// Ignore the first metadata event.
CHECK_EQ("\"1\":1e+100", all_args[1]);
CHECK_EQ("\"2\":\"NaN\"", all_args[2]);
CHECK_EQ("\"3\":\"Infinity\"", all_args[3]);
CHECK_EQ("\"4\":\"-Infinity\"", all_args[4]);
}
TEST(TracingPerfetto) {