Remove postprocess_plugin from semantics.

PiperOrigin-RevId: 425337839
bazelbuild · Jan 31, 2022 · 464bac3 · 464bac3
1 parent e1a912c
commit 464bac3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/src/main/starlark/builtins_bzl/common/java/java_plugin.bzl b/src/main/starlark/builtins_bzl/common/java/java_plugin.bzl
@@ -19,7 +19,6 @@ Definition of java_plugin rule.
 load(":common/java/java_common.bzl", "basic_java_library", "construct_defaultinfo")
 load(":common/java/java_library.bzl", "JAVA_LIBRARY_ATTRS", "JAVA_LIBRARY_IMPLICIT_ATTRS")
 load(":common/rule_util.bzl", "merge_attrs")
-load(":common/java/java_semantics.bzl", "semantics")
 load(":common/java/proguard_validation.bzl", "validate_proguard_specs")
 
 JavaPluginInfo = _builtins.toplevel.JavaPluginInfo
@@ -76,18 +75,16 @@ def bazel_java_plugin_rule(
     base_info.output_groups["_hidden_top_level_INTERNAL_"] = proguard_specs_provider.specs
     base_info.extra_providers["ProguardSpecProvider"] = proguard_specs_provider
 
-    java_info, extra_files = semantics.postprocess_plugin(ctx, base_info)
-
     java_plugin_info = JavaPluginInfo(
-        runtime_deps = [java_info],
+        runtime_deps = [base_info.java_info],
         processor_class = processor_class if processor_class else None,  # ignore empty string (default)
         data = data,
         generates_api = generates_api,
     )
 
     default_info = construct_defaultinfo(
         ctx,
-        base_info.files_to_build + extra_files,
+        base_info.files_to_build,
         neverlink,
         base_info.has_sources_or_resources,
     )

diff --git a/src/main/starlark/builtins_bzl/common/java/java_semantics.bzl b/src/main/starlark/builtins_bzl/common/java/java_semantics.bzl
@@ -23,9 +23,6 @@ JavaInfo = _builtins.toplevel.JavaInfo
 def _postprocess(ctx, base_info):
     return base_info.java_info
 
-def _postprocess_plugin(ctx, base_info):
-    return base_info.java_info, []
-
 def _check_proto_registry_collision(ctx):
     pass
 
@@ -58,7 +55,6 @@ semantics = struct(
     ],
     ALLOWED_RULES_IN_DEPS_WITH_WARNING = [],
     LINT_PROGRESS_MESSAGE = "Running Android Lint for: %{label}",
-    postprocess_plugin = _postprocess_plugin,
     check_proto_registry_collision = _check_proto_registry_collision,
     get_coverage_runner = _get_coverage_runner,
 )