diff options
| author | Michaël Zasso <targos@protonmail.com> | 2021-07-03 12:57:07 +0300 |
|---|---|---|
| committer | Richard Lau <rlau@redhat.com> | 2021-07-20 14:11:10 +0300 |
| commit | 17eb5611844cda29218291bafe3ac94567a2710f (patch) | |
| tree | 68c3cd4dfe2d9be24fa3fcd9a5245b1ecccbce08 /deps | |
| parent | ce4d224f8786cde82afdc92b67d0a0af26ffee0d (diff) | |
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: https://github.com/v8/v8/commit/1b1eda0876aa20bc1dc71caa6baf3a52c0c1540d
PR-URL: https://github.com/nodejs/node/pull/39244
Refs: https://github.com/nodejs/build/issues/2696
Reviewed-By: Richard Lau <rlau@redhat.com>
Diffstat (limited to 'deps')
| -rw-r--r-- | deps/v8/DEPS | 2 | ||||
| -rw-r--r-- | deps/v8/gni/proto_library.gni | 11 | ||||
| -rw-r--r-- | deps/v8/test/cctest/libplatform/test-tracing.cc | 9 |
3 files changed, 12 insertions, 10 deletions
diff --git a/deps/v8/DEPS b/deps/v8/DEPS index 7b38c3dcd07..07a28de315d 100644 --- a/deps/v8/DEPS +++ b/deps/v8/DEPS @@ -266,7 +266,7 @@ deps = { 'dep_type': 'cipd', }, 'v8/third_party/perfetto': - Var('android_url') + '/platform/external/perfetto.git' + '@' + 'ff70e0d273ed10995866c803f23e11250eb3dc52', + Var('android_url') + '/platform/external/perfetto.git' + '@' + '7cdc44f903d3bcfd1d0f67188bfa797a24756868', 'v8/third_party/protobuf': Var('chromium_url') + '/external/github.com/google/protobuf'+ '@' + 'b68a347f56137b4b1a746e8c7438495a6ac1bd91', 'v8/third_party/zlib': diff --git a/deps/v8/gni/proto_library.gni b/deps/v8/gni/proto_library.gni index eca3ffb84e5..0b72d7b8a45 100644 --- a/deps/v8/gni/proto_library.gni +++ b/deps/v8/gni/proto_library.gni @@ -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 { @@ -141,6 +139,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)) { diff --git a/deps/v8/test/cctest/libplatform/test-tracing.cc b/deps/v8/test/cctest/libplatform/test-tracing.cc index 81ad57b9c91..7572b887a17 100644 --- a/deps/v8/test/cctest/libplatform/test-tracing.cc +++ b/deps/v8/test/cctest/libplatform/test-tracing.cc @@ -860,10 +860,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]); } #endif // V8_USE_PERFETTO |