diff options
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaSemantics.java | 32 | ||||
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/java/JavaBinary.java | 1 |
2 files changed, 15 insertions, 18 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaSemantics.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaSemantics.java index 3e9969da75..703518be35 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaSemantics.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaSemantics.java @@ -576,23 +576,21 @@ public class BazelJavaSemantics implements JavaSemantics { JavaCommon javaCommon, Artifact gensrcJar, RuleConfiguredTargetBuilder ruleBuilder) { - if (!isJavaBinaryOrJavaTest(ruleContext)) { - // TODO(plf): Figure out whether we can remove support for C++ dependencies in Bazel. - CcLinkingInfo.Builder ccLinkingInfoBuilder = CcLinkingInfo.Builder.create(); - ccLinkingInfoBuilder.setCcLinkParamsInfo( - new CcLinkParamsInfo( - new CcLinkParamsStore() { - @Override - protected void collect( - CcLinkParams.Builder builder, boolean linkingStatically, boolean linkShared) { - builder.addTransitiveTargets( - javaCommon.targetsTreatedAsDeps(ClasspathType.BOTH), - JavaCcLinkParamsProvider.TO_LINK_PARAMS, - CcLinkParamsInfo.TO_LINK_PARAMS); - } - })); - ruleBuilder.addNativeDeclaredProvider(ccLinkingInfoBuilder.build()); - } + // TODO(plf): Figure out whether we can remove support for C++ dependencies in Bazel. + CcLinkingInfo.Builder ccLinkingInfoBuilder = CcLinkingInfo.Builder.create(); + ccLinkingInfoBuilder.setCcLinkParamsInfo( + new CcLinkParamsInfo( + new CcLinkParamsStore() { + @Override + protected void collect( + CcLinkParams.Builder builder, boolean linkingStatically, boolean linkShared) { + builder.addTransitiveTargets( + javaCommon.targetsTreatedAsDeps(ClasspathType.BOTH), + JavaCcLinkParamsProvider.TO_LINK_PARAMS, + CcLinkParamsInfo.TO_LINK_PARAMS); + } + })); + ruleBuilder.addNativeDeclaredProvider(ccLinkingInfoBuilder.build()); } // TODO(dmarting): simplify that logic when we remove the legacy Bazel java_test behavior. diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaBinary.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaBinary.java index 678ba8da45..b3b8ed1bf8 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaBinary.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaBinary.java @@ -301,7 +301,6 @@ public class JavaBinary implements RuleConfiguredTargetFactory { JavaPrimaryClassProvider.class, new JavaPrimaryClassProvider( semantics.getPrimaryClass(ruleContext, common.getSrcsArtifacts()))); - semantics.addProviders(ruleContext, common, genSourceJar, builder); if (generatedExtensionRegistryProvider != null) { builder.add(GeneratedExtensionRegistryProvider.class, generatedExtensionRegistryProvider); } |