Skip to content

Commit bbceab4

Browse files
targosrichardlau
authored andcommitted
deps: V8: backport 1b1eda0876aa
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: v8/v8@1b1eda0 PR-URL: #39245 Refs: nodejs/build#2696 Reviewed-By: Richard Lau <rlau@redhat.com>
1 parent 93a1a3c commit bbceab4

File tree

4 files changed

+13
-11
lines changed

4 files changed

+13
-11
lines changed

common.gypi

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

3535
# Reset this number to 0 on major V8 upgrades.
3636
# Increment by one for each non-official patch applied to deps/v8.
37-
'v8_embedder_string': '-node.47',
37+
'v8_embedder_string': '-node.48',
3838

3939
##### V8 defaults for Node.js #####
4040

deps/v8/DEPS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ deps = {
246246
'dep_type': 'cipd',
247247
},
248248
'v8/third_party/perfetto':
249-
Var('android_url') + '/platform/external/perfetto.git' + '@' + '01615892494a9a8dc84414962d0a817bf97de2c2',
249+
Var('android_url') + '/platform/external/perfetto.git' + '@' + '7cdc44f903d3bcfd1d0f67188bfa797a24756868',
250250
'v8/third_party/protobuf':
251251
Var('chromium_url') + '/external/github.com/google/protobuf'+ '@' + 'b68a347f56137b4b1a746e8c7438495a6ac1bd91',
252252
}

deps/v8/gni/proto_library.gni

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ template("proto_library") {
1111
assert(defined(invoker.sources))
1212
proto_sources = invoker.sources
1313

14-
set_sources_assignment_filter([])
15-
1614
if (host_os == "win") {
1715
host_executable_suffix = ".exe"
1816
} else {
@@ -137,6 +135,12 @@ template("proto_library") {
137135
]
138136
}
139137

138+
if (defined(invoker.import_dirs)) {
139+
foreach(path, invoker.import_dirs) {
140+
args += [ "--import-dir=" + rebase_path(path, root_build_dir) ]
141+
}
142+
}
143+
140144
if (generate_with_plugin) {
141145
plugin_path_rebased = rebase_path(plugin_path, root_build_dir)
142146
plugin_out_args = ""
@@ -187,10 +191,7 @@ template("proto_library") {
187191
"visibility",
188192
])
189193

190-
# Exclude the config.descriptor file which is an output for some reason.
191-
set_sources_assignment_filter([ "*.descriptor" ])
192194
sources = get_target_outputs(":$action_name")
193-
set_sources_assignment_filter(sources_assignment_filter)
194195

195196
# configs -= [ "//gn/standalone:extra_warnings" ]
196197
if (defined(invoker.extra_configs)) {

deps/v8/test/cctest/libplatform/test-tracing.cc

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -891,10 +891,11 @@ TEST(JsonIntegrationTest) {
891891
std::vector<std::string> all_args;
892892
GetJSONStrings(&all_args, json, "\"args\"", "{", "}");
893893

894-
CHECK_EQ("\"1\":1e+100", all_args[0]);
895-
CHECK_EQ("\"2\":\"NaN\"", all_args[1]);
896-
CHECK_EQ("\"3\":\"Infinity\"", all_args[2]);
897-
CHECK_EQ("\"4\":\"-Infinity\"", all_args[3]);
894+
// Ignore the first metadata event.
895+
CHECK_EQ("\"1\":1e+100", all_args[1]);
896+
CHECK_EQ("\"2\":\"NaN\"", all_args[2]);
897+
CHECK_EQ("\"3\":\"Infinity\"", all_args[3]);
898+
CHECK_EQ("\"4\":\"-Infinity\"", all_args[4]);
898899
}
899900

900901
TEST(TracingPerfetto) {

0 commit comments

Comments
 (0)