Skip to content

Commit af504cf

Browse files
dx404rules_java Copybara
authored andcommitted
Rename extra_processor_classes to processor_classes for processor bundle support
- Better support the inter-op between `JavaPluginInfo` and `KtCodegenPluginInfo` PiperOrigin-RevId: 724216672 Change-Id: Iab6a345faff2f0ca84bd9a4da5518b98aa922ed9
1 parent 6f2db13 commit af504cf

File tree

2 files changed

+7
-9
lines changed

2 files changed

+7
-9
lines changed

java/bazel/rules/bazel_java_plugin.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ def bazel_java_plugin_rule(
8484
# Replace JavaInfo with JavaPluginInfo
8585
target["JavaPluginInfo"] = JavaPluginInfo(
8686
runtime_deps = [java_info],
87-
processor_class = processor_class if processor_class else None, # ignore empty string (default)
87+
processor_classes = [processor_class] if processor_class else [], # ignore empty string (default)
8888
data = data,
8989
generates_api = generates_api,
9090
)

java/private/java_info.bzl

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -932,17 +932,19 @@ def _merge_plugin_data(datas):
932932

933933
def _javaplugininfo_init(
934934
runtime_deps,
935-
processor_class,
935+
processor_class = None,
936+
processor_classes = [],
936937
data = [],
937-
generates_api = False,
938-
extra_processor_classes = []):
938+
generates_api = False):
939939
""" Constructs JavaPluginInfo
940940
941941
Args:
942942
runtime_deps: ([JavaInfo]) list of deps containing an annotation
943943
processor.
944944
processor_class: (String) The fully qualified class name that the Java
945945
compiler uses as an entry point to the annotation processor.
946+
processor_classes: ([String]) Fully qualified class names that the
947+
Java compiler uses as an entry point to the annotation processor.
946948
data: (depset[File]) The files needed by this annotation
947949
processor during execution.
948950
generates_api: (boolean) Set to true when this annotation processor
@@ -952,19 +954,15 @@ def _javaplugininfo_init(
952954
generated from the sources, reducing the critical path.
953955
WARNING: This parameter affects build performance, use it only if
954956
necessary.
955-
extra_processor_classes: ([String]) Additional fully qualified class
956-
names that the Java compiler uses as an entry point to the
957-
annotation processor.
958957
959958
Returns:
960959
(JavaPluginInfo)
961960
"""
962961

963962
java_infos = merge(runtime_deps)
964963
processor_data = data if type(data) == "depset" else depset(data)
965-
processor_classes = ([processor_class] if processor_class else []) + extra_processor_classes
966964
plugins = _create_plugin_data_info(
967-
processor_classes = depset(processor_classes),
965+
processor_classes = depset([processor_class] + processor_classes) if processor_class else depset(processor_classes),
968966
processor_jars = java_infos.transitive_runtime_jars,
969967
processor_data = processor_data,
970968
)

0 commit comments

Comments
 (0)