BEGIN_PUBLIC Stop pulling ProGuard spec from Java plugins into target ProguardSpecProviders. END_PUBLIC PiperOrigin-RevId: 539007623 Change-Id: I642c5db0c8752b231b00b914b6773dcbb2ca49fe
diff --git a/src/main/starlark/builtins_bzl/common/java/java_common.bzl b/src/main/starlark/builtins_bzl/common/java/java_common.bzl index 2210d92..776cb3a 100644 --- a/src/main/starlark/builtins_bzl/common/java/java_common.bzl +++ b/src/main/starlark/builtins_bzl/common/java/java_common.bzl
@@ -182,7 +182,7 @@ target["ProguardSpecProvider"] = validate_proguard_specs( ctx, proguard_specs, - [deps, runtime_deps, exports, plugins, exported_plugins], + [deps, runtime_deps, exports], ) output_groups["_hidden_top_level_INTERNAL_"] = target["ProguardSpecProvider"].specs
diff --git a/src/test/java/com/google/devtools/build/lib/view/java/JavaPluginConfiguredTargetTest.java b/src/test/java/com/google/devtools/build/lib/view/java/JavaPluginConfiguredTargetTest.java index 55eb342..015a690 100644 --- a/src/test/java/com/google/devtools/build/lib/view/java/JavaPluginConfiguredTargetTest.java +++ b/src/test/java/com/google/devtools/build/lib/view/java/JavaPluginConfiguredTargetTest.java
@@ -134,7 +134,8 @@ .get(ProguardSpecProvider.PROVIDER) .getTransitiveProguardSpecs(); assertThat(ActionsTestUtil.baseArtifactNames(providedSpecs)) - .containsAtLeast("top.pro_valid", "dep.pro_valid", "plugin.pro_valid"); + .containsAtLeast("top.pro_valid", "dep.pro_valid"); + assertThat(ActionsTestUtil.baseArtifactNames(providedSpecs)).doesNotContain("plugin.pro_valid"); } @Test