Fix CI error when running `bazel --nosystem_rc --nohome_rc info`.
The protobuf is not included as a dep but we use it. Hence currently
we have the following error:
```
at /workdir/rs_bindings_from_cc/bazel_support/rust_bindings_from_cc_aspect.bzl:33:6: Label '//third_party/protobuf/bazel/common:proto_info.bzl' is invalid because 'third_party/protobuf/bazel/common' is not a package; perhaps you meant to put the colon here: '//:third_party/protobuf/bazel/common/proto_info.bzl'?
```
PiperOrigin-RevId: 655643871
Change-Id: Idd7db92d00f8d3dfa4f424c7bfab019f1fc0351b
diff --git a/bazel/llvm.bzl b/bazel/llvm.bzl
index a808394..69fd6e8 100644
--- a/bazel/llvm.bzl
+++ b/bazel/llvm.bzl
@@ -53,7 +53,7 @@
executable = False,
)
-LLVM_COMMIT_SHA = "acc159aea1e641e3694ab8fe5faa231788077011"
+LLVM_COMMIT_SHA = "84658fb82b67fc22ecba1560d0cddd09f9104178"
def llvm_loader_repository_dependencies():
# This *declares* the dependency, but it won't actually be *downloaded* unless it's used.
diff --git a/rs_bindings_from_cc/bazel_support/BUILD b/rs_bindings_from_cc/bazel_support/BUILD
index d91e480..76422e4 100644
--- a/rs_bindings_from_cc/bazel_support/BUILD
+++ b/rs_bindings_from_cc/bazel_support/BUILD
@@ -22,7 +22,6 @@
":providers_bzl",
":rust_bindings_from_cc_cli_flag_aspect_hint",
":rust_bindings_from_cc_utils_bzl",
- "//third_party/protobuf/bazel/common:proto_info_bzl",
],
)
diff --git a/rs_bindings_from_cc/bazel_support/rust_bindings_from_cc_aspect.bzl b/rs_bindings_from_cc/bazel_support/rust_bindings_from_cc_aspect.bzl
index 38c999e..928da56 100644
--- a/rs_bindings_from_cc/bazel_support/rust_bindings_from_cc_aspect.bzl
+++ b/rs_bindings_from_cc/bazel_support/rust_bindings_from_cc_aspect.bzl
@@ -30,7 +30,6 @@
"bindings_attrs",
"generate_and_compile_bindings",
)
-load("//third_party/protobuf/bazel/common:proto_info.bzl", "ProtoInfo")
# <internal link>/127#naming-header-files-h-and-inc recommends declaring textual headers either in the
# `textual_hdrs` attribute of the Bazel C++ rules, or using the `.inc` file extension. Therefore
@@ -92,9 +91,6 @@
public_hdrs = []
return public_hdrs, all_standalone_hdrs
-def _is_proto_library(target):
- return ProtoInfo in target
-
def _is_cc_proto_library(rule):
return rule.kind == "cc_proto_library"
@@ -135,12 +131,7 @@
features = find_crubit_features(target, ctx)
if hasattr(ctx.rule.attr, "hdrs"):
public_hdrs, all_standalone_hdrs = _collect_hdrs(ctx, features)
- elif _is_proto_library(target):
- #TODO(b/232199093): Ideally we would get this information from a proto-specific provider,
- # but ProtoCcFilesProvider is private currently. Use it once public.
- public_hdrs = retain_proto_dot_h_headers(target[CcInfo].compilation_context.direct_headers)
- all_standalone_hdrs = public_hdrs
- extra_rule_specific_deps = [ctx.rule.attr._cc_lib]
+
elif ctx.rule.kind == "cc_embed_data" or ctx.rule.kind == "upb_proto_library":
public_hdrs = target[CcInfo].compilation_context.direct_public_headers
all_standalone_hdrs = target[CcInfo].compilation_context.direct_headers
