Skip to content

Commit f242e0f

Browse files
osa1Commit Queue
authored andcommitted
Update Dart protobuf, update perfetto protos with protoc_plugin-24.0.0
The update script at `third_party/perfetto/tools/compile_perfetto_protos.dart` doesn't work out of the box. Steps to to generate this CL: - Apply diffs: ``` diff --git a/DEPS b/DEPS index c7b224d28c2..6532cf91e8c 100644 --- a/DEPS +++ b/DEPS @@ -75,7 +75,7 @@ vars = { "jsc_tag": "version:301576", # https://chrome-infra-packages.appspot.com/p/fuchsia/third_party/clang - "clang_version": "git_revision:8b93f27cf7e6e53636db870873b53269efa3cca4", + "clang_version": "git_revision:49f39b349db181ca516eb0253462105ff0e2c634", # https://chrome-infra-packages.appspot.com/p/gn/gn "gn_version": "git_revision:07d3c6f4dc290fae5ca6152ebcb37d6815c411ab", ``` ``` diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn index b041a07..077dd104d79 100644 --- a/build/config/compiler/BUILD.gn +++ b/build/config/compiler/BUILD.gn @@ -651,6 +651,7 @@ if (is_win) { "-Wno-tautological-constant-compare", "-Wno-unused-but-set-variable", # icu "-Wno-deprecated-non-prototype", # zlib + "-Wno-unnecessary-virtual-specifier", ] } else { default_warning_flags += [ ``` This will make the perfetto build targets buildable. - Remove all generated proto files in `pkg/vm_service_protos`. `compile_perfetto_protos.dart` doesn't properly update existing files, and doesn't delete files that are not generated by the protoc plugin. - Run `third_party/perfetto/tools/compile_perfetto_protos.dart` with the in-tree SDK. - `git cl format .` to format generated files. Also update transformer test expectations based on the new plugin and the lib. Tested: existing tests Change-Id: I475f12313687b93b8f0ed01206cc7a9fcb2725e1 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/459421 Reviewed-by: Slava Egorov <vegorov@google.com> Commit-Queue: Ömer Ağacan <omersa@google.com>
1 parent f0d6034 commit f242e0f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+1454
-2019
lines changed

DEPS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ vars = {
141141
"leak_tracker_rev": "f5620600a5ce1c44f65ddaa02001e200b096e14c", # rolled manually
142142
"material_color_utilities_rev": "799b6ba2f3f1c28c67cc7e0b4f18e0c7d7f3c03e",
143143
"native_rev": "3ec573500f743d4a1393f7802143aef50fec0a47", # rolled manually while native assets are experimental
144-
"protobuf_rev": "7db07843c86de526edbe3c4d668c0962ef0b203b",
144+
"protobuf_rev": "4dfedafd160e203b9b5a91737fc0de962dc40b24",
145145
"pub_rev": "f7f1891e2de3d795532f45ec214f88ac912ffcd6", # rolled manually
146146
"shelf_rev": "710b8cef08f69acf176c807eaf274dfb8656fde0",
147147
"sync_http_rev": "6666fff944221891182e1f80bf56569338164d72",

pkg/vm/testcases/transformations/type_flow/transformer/protobuf_handler/compile_protos.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ mkdir $DIR/lib/generated
1313
# Directory of the script
1414
GENERATED_DIR=$DIR/lib/generated
1515

16-
protoc --dart_out=$GENERATED_DIR -I$DIR/protos $DIR/protos/*.proto
17-
rm $GENERATED_DIR/*.pbenum.dart $GENERATED_DIR/*.pbjson.dart $GENERATED_DIR/*.pbserver.dart
16+
protoc --dart_out=disable_constructor_args:$GENERATED_DIR -I$DIR/protos $DIR/protos/*.proto
17+
18+
rm $GENERATED_DIR/*.pbenum.dart $GENERATED_DIR/*.pbjson.dart
1819

1920
dart format $DIR/lib/generated

pkg/vm/testcases/transformations/type_flow/transformer/protobuf_handler/lib/create_test.dart.expect

Lines changed: 35 additions & 28 deletions
Large diffs are not rendered by default.

pkg/vm/testcases/transformations/type_flow/transformer/protobuf_handler/lib/decode_test.dart.expect

Lines changed: 31 additions & 20 deletions
Large diffs are not rendered by default.

pkg/vm/testcases/transformations/type_flow/transformer/protobuf_handler/lib/encode_all_fields.dart.expect

Lines changed: 91 additions & 78 deletions
Large diffs are not rendered by default.

pkg/vm/testcases/transformations/type_flow/transformer/protobuf_handler/lib/freeze_test.dart.expect

Lines changed: 35 additions & 28 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)