Automated rollback of commit 92d760b37722feffd5b1121e4f9a1152d8120946.
*** Reason for rollback ***
Causing a problem with the global DB indexer (b/230402010)
RELNOTES: None.
*** Original change description ***
Roll forward of https://github.com/bazelbuild/bazel/commit/8f269bbe37d4597e41c1268dadeb8d9deb7ba719: Stop passing dependencies' descriptor sets when generating descriptor sets
RELNOTES: None.
PiperOrigin-RevId: 444679473
diff --git a/src/main/starlark/builtins_bzl/common/proto/proto_library.bzl b/src/main/starlark/builtins_bzl/common/proto/proto_library.bzl
index 84c691d..c4b11e7 100644
--- a/src/main/starlark/builtins_bzl/common/proto/proto_library.bzl
+++ b/src/main/starlark/builtins_bzl/common/proto/proto_library.bzl
@@ -225,6 +225,8 @@
ctx.actions.write(descriptor_set, "")
return
+ dependencies_descriptor_sets = depset(transitive = [dep.transitive_descriptor_sets for dep in deps])
+
args = ctx.actions.args()
if ctx.fragments.proto.experimental_proto_descriptorsets_include_source_info():
args.add("--include_source_info")
@@ -260,6 +262,7 @@
mnemonic = "GenProtoDescriptorSet",
progress_message = "Generating Descriptor Set proto_library %{label}",
outputs = [descriptor_set],
+ additional_inputs = dependencies_descriptor_sets,
additional_args = args,
)
