From 38f0bd4d152f2965ff7a6e21a7e5e029c1bde435 Mon Sep 17 00:00:00 2001
From: Deanna Garcia <deannagarcia@google.com>
Date: Fri, 20 May 2022 21:28:55 +0000
Subject: [PATCH] Fix bazel builds

---
 pkg/BUILD.bazel | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/pkg/BUILD.bazel b/pkg/BUILD.bazel
index 93d816ea9d..f30c8367cf 100644
--- a/pkg/BUILD.bazel
+++ b/pkg/BUILD.bazel
@@ -17,17 +17,8 @@ package_naming(
 pkg_files(
     name = "wkt_protos_files",
     srcs = [
-        "//:src/google/protobuf/any.proto",
-        "//:src/google/protobuf/api.proto",
-        "//:src/google/protobuf/descriptor.proto",
-        "//:src/google/protobuf/duration.proto",
-        "//:src/google/protobuf/empty.proto",
-        "//:src/google/protobuf/field_mask.proto",
-        "//:src/google/protobuf/source_context.proto",
-        "//:src/google/protobuf/struct.proto",
-        "//:src/google/protobuf/timestamp.proto",
-        "//:src/google/protobuf/type.proto",
-        "//:src/google/protobuf/wrappers.proto",
+        "//:well_known_type_protos",
+        "//src/google/protobuf:descriptor_proto_srcs",
     ],
     prefix = "include/google/protobuf",
     visibility = ["//visibility:private"],
@@ -35,7 +26,9 @@ pkg_files(
 
 pkg_files(
     name = "compiler_plugin_protos_files",
-    srcs = ["//:src/google/protobuf/compiler/plugin.proto"],
+    srcs = [
+      "//src/google/protobuf/compiler:compiler_plugin_protos_files",
+    ],
     prefix = "include/google/protobuf/compiler",
     visibility = ["//visibility:private"],
 )
@@ -76,11 +69,9 @@ pkg_zip(
     name = "protoc_release",
     srcs = [
         ":compiler_plugin_protos_files",
-        ":descriptor_protos_files",
         ":protoc_files",
         ":protoc_readme",
         ":wkt_protos_files",
-        "//src/google/protobuf/compiler:compiler_plugin_protos_files",
     ],
     package_file_name = "protoc-{version}-{platform}.zip",
     package_variables = ":protobuf_pkg_naming",