From 51adb09adc15294185d7e035f57f54bcdcaa633b Mon Sep 17 00:00:00 2001 From: Protobuf Team Bot Date: Mon, 16 Sep 2024 10:50:52 -0700 Subject: [PATCH] Remove JavaProtoAspectInfo duplication Everything should work without this change, because all references are done to a single definition. But the accidental duplication needs to be removed eventually. PiperOrigin-RevId: 675211197 --- bazel/private/bazel_java_proto_library_rule.bzl | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/bazel/private/bazel_java_proto_library_rule.bzl b/bazel/private/bazel_java_proto_library_rule.bzl index adfbe68d8a..e5217f2de4 100644 --- a/bazel/private/bazel_java_proto_library_rule.bzl +++ b/bazel/private/bazel_java_proto_library_rule.bzl @@ -9,14 +9,11 @@ load("@rules_java//java/common:java_info.bzl", "JavaInfo") load("//bazel/common:proto_common.bzl", "proto_common") load("//bazel/common:proto_info.bzl", "ProtoInfo") -load("//bazel/private:java_proto_support.bzl", "java_compile_for_protos", "java_info_merge_for_protos") +load("//bazel/private:java_proto_support.bzl", "JavaProtoAspectInfo", "java_compile_for_protos", "java_info_merge_for_protos") load("//bazel/private:toolchain_helpers.bzl", "toolchains") _JAVA_PROTO_TOOLCHAIN = "//bazel/private:java_toolchain_type" -# The provider is used to collect source and runtime jars in the `proto_library` dependency graph. -JavaProtoAspectInfo = provider("JavaProtoAspectInfo", fields = ["jars"]) - def _filter_provider(provider, *attrs): return [dep[provider] for attr in attrs for dep in attr if provider in dep]