Remove unused legacyCollectCppAndJavaLinkOptions.

--
MOS_MIGRATED_REVID=123026183

1 files changed, 4 insertions, 23 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaLibraryHelper.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaLibraryHelper.java
index 0be431937c..94205227e1 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaLibraryHelper.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaLibraryHelper.java
@@ -93,7 +93,6 @@ public final class JavaLibraryHelper {
   private StrictDepsMode strictDepsMode = StrictDepsMode.OFF;
   private JavaClasspathMode classpathMode = JavaClasspathMode.OFF;
   private boolean emitProviders = true;
-  private boolean legacyCollectCppAndJavaLinkOptions;
 
   public JavaLibraryHelper(RuleContext ruleContext) {
     this(ruleContext, DEFAULT_SUFFIX_IS_EMPTY_STRING);
@@ -209,16 +208,6 @@ public final class JavaLibraryHelper {
   }
 
   /**
-   * Collects link options from both Java and C++ dependencies. This is never what you want, and
-   * only exists for backwards compatibility.
-   */
-  public JavaLibraryHelper setLegacyCollectCppAndJavaLinkOptions(
-      boolean legacyCollectCppAndJavaLinkOptions) {
-    this.legacyCollectCppAndJavaLinkOptions = legacyCollectCppAndJavaLinkOptions;
-    return this;
-  }
-
-  /**
    * Creates the compile actions and providers.
    */
   public Info build(JavaSemantics semantics) {
@@ -354,18 +343,10 @@ public final class JavaLibraryHelper {
     return new CcLinkParamsStore() {
       @Override
       protected void collect(Builder builder, boolean linkingStatically, boolean linkShared) {
-        if (legacyCollectCppAndJavaLinkOptions) {
-          builder.addTransitiveTargets(deps,
-              JavaCcLinkParamsProvider.TO_LINK_PARAMS);
-          builder.addTransitiveTargets(deps,
-              CcLinkParamsProvider.TO_LINK_PARAMS,
-              CcSpecificLinkParamsProvider.TO_LINK_PARAMS);
-        } else {
-          builder.addTransitiveTargets(deps,
-              JavaCcLinkParamsProvider.TO_LINK_PARAMS,
-              CcLinkParamsProvider.TO_LINK_PARAMS,
-              CcSpecificLinkParamsProvider.TO_LINK_PARAMS);
-        }
+        builder.addTransitiveTargets(deps,
+            JavaCcLinkParamsProvider.TO_LINK_PARAMS,
+            CcLinkParamsProvider.TO_LINK_PARAMS,
+            CcSpecificLinkParamsProvider.TO_LINK_PARAMS);
       }
     };
   }