commit 748773a61f63a5bfa6a0c7a2b177f5cb49d75f43
author hlopko <hlopko@google.com> Tue Sep 04 07:45:23 2018 -0700
committer Copybara-Service <copybara-piper@google.com> Tue Sep 04 07:47:18 2018 -0700
tree f6c663fc6e647098a7d19fe3b7e4fb0fec3fa19c
parent 411ab49f8317ac0ff60c833672422fdb0df358ea

Remove unused argument from CcToolchainConfigInfo.fromToolchain

#6072.

RELNOTES: None.
PiperOrigin-RevId: 211455462

src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchain.java

diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchain.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchain.java
index bd61ce8..7b2b9e6 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchain.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchain.java
@@ -644,9 +644,7 @@
       toolchain =
           CppToolchainInfo.addLegacyFeatures(
               toolchain, cppConfiguration.getCrosstoolTopPathFragment());
-      CcToolchainConfigInfo ccToolchainConfigInfo =
-          CcToolchainConfigInfo.fromToolchain(
-              cppConfiguration.getCrosstoolFile().getProto(), toolchain);
+      CcToolchainConfigInfo ccToolchainConfigInfo = CcToolchainConfigInfo.fromToolchain(toolchain);
       return CppToolchainInfo.create(
           cppConfiguration.getCrosstoolTopPathFragment(),
           cppConfiguration.getCcToolchainRuleLabel(),

src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainConfigInfo.java

diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainConfigInfo.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainConfigInfo.java
index 71f9bec..1213ee9 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainConfigInfo.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainConfigInfo.java
@@ -29,7 +29,6 @@
 import com.google.devtools.build.lib.util.Pair;
 import com.google.devtools.build.lib.view.config.crosstool.CrosstoolConfig.CToolchain;
 import com.google.devtools.build.lib.view.config.crosstool.CrosstoolConfig.CompilationModeFlags;
-import com.google.devtools.build.lib.view.config.crosstool.CrosstoolConfig.CrosstoolRelease;
 import com.google.devtools.build.lib.view.config.crosstool.CrosstoolConfig.LinkingModeFlags;
 
 /** Information describing C++ toolchain derived from CROSSTOOL file. */
@@ -172,7 +171,7 @@
     this.hasDynamicLinkingModeFlags = hasDynamicLinkingModeFlags;
   }
 
-  public static CcToolchainConfigInfo fromToolchain(CrosstoolRelease file, CToolchain toolchain)
+  public static CcToolchainConfigInfo fromToolchain(CToolchain toolchain)
       throws InvalidConfigurationException {
 
     ImmutableList.Builder<ActionConfig> actionConfigBuilder = ImmutableList.builder();

src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfigurationLoader.java

diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfigurationLoader.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfigurationLoader.java
index c33574b..36827f9 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfigurationLoader.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfigurationLoader.java
@@ -255,8 +255,7 @@
         CppToolchainInfo.addLegacyFeatures(
             toolchain, crosstoolTopLabel.getPackageIdentifier().getPathUnderExecRoot());
 
-    CcToolchainConfigInfo ccToolchainConfigInfo =
-        CcToolchainConfigInfo.fromToolchain(file.getProto(), toolchain);
+    CcToolchainConfigInfo ccToolchainConfigInfo = CcToolchainConfigInfo.fromToolchain(toolchain);
 
     Label sysrootLabel = getSysrootLabel(toolchain, cppOptions.libcTopLabel);
 

src/test/java/com/google/devtools/build/lib/rules/cpp/CcToolchainFeaturesTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcToolchainFeaturesTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcToolchainFeaturesTest.java
index c3b6082..5714ebe 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcToolchainFeaturesTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcToolchainFeaturesTest.java
@@ -45,7 +45,6 @@
 import com.google.devtools.build.lib.vfs.Path;
 import com.google.devtools.build.lib.vfs.PathFragment;
 import com.google.devtools.build.lib.view.config.crosstool.CrosstoolConfig.CToolchain;
-import com.google.devtools.build.lib.view.config.crosstool.CrosstoolConfig.CrosstoolRelease;
 import com.google.protobuf.TextFormat;
 import java.io.IOException;
 import java.util.Collection;
@@ -94,8 +93,7 @@
     CToolchain.Builder toolchainBuilder = CToolchain.newBuilder();
     TextFormat.merge(Joiner.on("").join(toolchain), toolchainBuilder);
     return new CcToolchainFeatures(
-        CcToolchainConfigInfo.fromToolchain(
-            CrosstoolRelease.getDefaultInstance(), toolchainBuilder.buildPartial()),
+        CcToolchainConfigInfo.fromToolchain(toolchainBuilder.buildPartial()),
         PathFragment.create("crosstool/"));
   }
 
@@ -104,8 +102,7 @@
     CToolchain.Builder toolchainBuilder = CToolchain.newBuilder();
     TextFormat.merge(Joiner.on("").join(toolchain), toolchainBuilder);
     return new CcToolchainFeatures(
-        CcToolchainConfigInfo.fromToolchain(
-            CrosstoolRelease.getDefaultInstance(), toolchainBuilder.buildPartial()),
+        CcToolchainConfigInfo.fromToolchain(toolchainBuilder.buildPartial()),
         PathFragment.EMPTY_FRAGMENT);
   }
 

src/test/java/com/google/devtools/build/lib/rules/cpp/LinkBuildVariablesTestCase.java

diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/LinkBuildVariablesTestCase.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/LinkBuildVariablesTestCase.java
index ba9c7b9..b2e0da7 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/cpp/LinkBuildVariablesTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/LinkBuildVariablesTestCase.java
@@ -23,7 +23,6 @@
 import com.google.devtools.build.lib.rules.cpp.CcToolchainFeatures.FeatureConfiguration;
 import com.google.devtools.build.lib.vfs.PathFragment;
 import com.google.devtools.build.lib.view.config.crosstool.CrosstoolConfig.CToolchain;
-import com.google.devtools.build.lib.view.config.crosstool.CrosstoolConfig.CrosstoolRelease;
 import com.google.protobuf.TextFormat;
 import java.util.List;
 
@@ -73,8 +72,7 @@
     CToolchain.Builder toolchainBuilder = CToolchain.newBuilder();
     TextFormat.merge(Joiner.on("").join(toolchain), toolchainBuilder);
     return new CcToolchainFeatures(
-        CcToolchainConfigInfo.fromToolchain(
-            CrosstoolRelease.getDefaultInstance(), toolchainBuilder.buildPartial()),
+        CcToolchainConfigInfo.fromToolchain(toolchainBuilder.buildPartial()),
         /* ccToolchainPath= */ PathFragment.EMPTY_FRAGMENT);
   }