Skip to content

Commit

Permalink
Remove JavaProtoAspectInfo duplication
Browse files Browse the repository at this point in the history
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
  • Loading branch information
protobuf-github-bot authored and haberman committed Sep 18, 2024
1 parent 33fd9e1 commit 2423d18
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions bazel/private/bazel_java_proto_library_rule.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -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]

Expand Down

0 comments on commit 2423d18

Please sign in to comment.