Skip to content

Commit

Permalink
Automated rollback of commit 8f269bb.
Browse files Browse the repository at this point in the history
*** Reason for rollback ***

Causing problems with globaldb indexer

The original CL had the unexpected side effect of causing certain errors not
being detected in the expected way. The globaldb indexer for example assumes
that if a proto builds successfully then all its dependencies must be correct.
Some errors stopped being detected at presubmit time as well, since a
build_test() of a proto_library no longer checks all dependencies.

I have some ideas for how to fix these problems but in the short term I think
we need to roll this back to get the globaldb back into a healthy state.

PiperOrigin-RevId: 431804322
  • Loading branch information
Googler authored and copybara-github committed Mar 2, 2022
1 parent b891f9e commit 694e01d
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions src/main/starlark/builtins_bzl/common/proto/proto_library.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,8 @@ def _write_descriptor_set(ctx, deps, proto_info, descriptor_set):
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")
Expand Down Expand Up @@ -253,6 +255,7 @@ def _write_descriptor_set(ctx, deps, proto_info, descriptor_set):
mnemonic = "GenProtoDescriptorSet",
progress_message = "Generating Descriptor Set proto_library %{label}",
outputs = [descriptor_set],
additional_inputs = dependencies_descriptor_sets,
additional_args = args,
strict_imports = strict_public_imports_mode != "OFF" and strict_public_imports_mode != "DEFAULT",
)
Expand Down

0 comments on commit 694e01d

Please sign in to comment.