From 9c89a70e6b62ec2914fa7ff72570c553e530b9b7 Mon Sep 17 00:00:00 2001 From: deannagarcia <69992229+deannagarcia@users.noreply.github.com> Date: Fri, 17 Feb 2023 13:26:53 -0800 Subject: [PATCH 1/2] Strip "src" from file name of plugin.proto In 22.x, we accidentally omitted stripping the "src" import prefix for plugin.proto. We stripped the prefix in 21.x and for all other well known types in 22.x. This reverts that unintentional change. --- src/google/protobuf/compiler/BUILD.bazel | 1 + 1 file changed, 1 insertion(+) diff --git a/src/google/protobuf/compiler/BUILD.bazel b/src/google/protobuf/compiler/BUILD.bazel index cfbf714870..1d3a33570b 100644 --- a/src/google/protobuf/compiler/BUILD.bazel +++ b/src/google/protobuf/compiler/BUILD.bazel @@ -20,6 +20,7 @@ proto_library( "//:__pkg__", "//pkg:__pkg__", ], + strip_import_prefix = "src", deps = ["//:descriptor_proto"], ) From aece606096097cb8fa3f6770e3c2cd1359fb0295 Mon Sep 17 00:00:00 2001 From: deannagarcia <69992229+deannagarcia@users.noreply.github.com> Date: Fri, 17 Feb 2023 13:40:01 -0800 Subject: [PATCH 2/2] Add forward slash --- src/google/protobuf/compiler/BUILD.bazel | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/google/protobuf/compiler/BUILD.bazel b/src/google/protobuf/compiler/BUILD.bazel index 1d3a33570b..5fb5fb87c3 100644 --- a/src/google/protobuf/compiler/BUILD.bazel +++ b/src/google/protobuf/compiler/BUILD.bazel @@ -20,7 +20,7 @@ proto_library( "//:__pkg__", "//pkg:__pkg__", ], - strip_import_prefix = "src", + strip_import_prefix = "/src", deps = ["//:descriptor_proto"], )