Remove make variable providers from ToolchainType.

PiperOrigin-RevId: 205236169

2 files changed, 0 insertions, 28 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/rules/ToolchainTypeTest.java b/src/test/java/com/google/devtools/build/lib/rules/ToolchainTypeTest.java
index c602441cb4..4fc5153e07 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/ToolchainTypeTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/ToolchainTypeTest.java
@@ -16,7 +16,6 @@ package com.google.devtools.build.lib.rules;
 import static com.google.common.truth.Truth.assertThat;
 
 import com.google.devtools.build.lib.analysis.ConfiguredTarget;
-import com.google.devtools.build.lib.analysis.TemplateVariableInfo;
 import com.google.devtools.build.lib.analysis.util.BuildViewTestCase;
 import com.google.devtools.build.lib.analysis.util.ScratchAttributeWriter;
 import com.google.devtools.build.lib.rules.cpp.CppCompileAction;
@@ -30,20 +29,6 @@ import org.junit.runners.JUnit4;
 public class ToolchainTypeTest extends BuildViewTestCase {
 
   @Test
-  public void testSmoke() throws Exception {
-    ConfiguredTarget cc =
-        getConfiguredTarget(TestConstants.TOOLS_REPOSITORY + "//tools/cpp:toolchain_type");
-    assertThat(cc.get(TemplateVariableInfo.PROVIDER).getVariables()).containsKey("CC_FLAGS");
-  }
-
-  @Test
-  public void testCcToolchainDoesNotProvideJavaMakeVariables() throws Exception {
-    ConfiguredTarget cc =
-        getConfiguredTarget(TestConstants.TOOLS_REPOSITORY + "//tools/cpp:toolchain_type");
-    assertThat(cc.get(TemplateVariableInfo.PROVIDER).getVariables()).doesNotContainKey("JAVABASE");
-  }
-
-  @Test
   public void testCcTargetsDependOnCcToolchainAutomatically() throws Exception {
     scratch.file(
         "a/BUILD",
diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcCommonTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcCommonTest.java
index 580c4e7f7e..0ea347a0dd 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcCommonTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcCommonTest.java
@@ -29,7 +29,6 @@ import com.google.devtools.build.lib.analysis.AnalysisUtils;
 import com.google.devtools.build.lib.analysis.ConfiguredRuleClassProvider;
 import com.google.devtools.build.lib.analysis.ConfiguredTarget;
 import com.google.devtools.build.lib.analysis.OutputGroupInfo;
-import com.google.devtools.build.lib.analysis.config.BuildConfiguration;
 import com.google.devtools.build.lib.analysis.mock.BazelAnalysisMock;
 import com.google.devtools.build.lib.analysis.util.AnalysisMock;
 import com.google.devtools.build.lib.analysis.util.BuildViewTestCase;
@@ -40,7 +39,6 @@ import com.google.devtools.build.lib.bazel.rules.ToolchainRules;
 import com.google.devtools.build.lib.cmdline.Label;
 import com.google.devtools.build.lib.cmdline.PackageIdentifier;
 import com.google.devtools.build.lib.cmdline.RepositoryName;
-import com.google.devtools.build.lib.rules.ToolchainType;
 import com.google.devtools.build.lib.rules.core.CoreRules;
 import com.google.devtools.build.lib.rules.platform.PlatformRules;
 import com.google.devtools.build.lib.rules.repository.CoreWorkspaceRules;
@@ -970,17 +968,6 @@ public class CcCommonTest extends BuildViewTestCase {
   }
 
   /**
-   * A {@code toolchain_type} rule for testing that only supports C++.
-   */
-  public static class OnlyCppToolchainType extends ToolchainType {
-    public OnlyCppToolchainType() {
-      super(
-          ImmutableMap.<Label, Class<? extends BuildConfiguration.Fragment>>of(),
-          ImmutableMap.<Label, ImmutableMap<String, String>>of());
-    }
-  }
-
-  /**
    * Tests for the case where there are only C++ rules defined.
    */
   @RunWith(JUnit4.class)