aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/test/java/com/google/devtools/build/lib/rules/cpp/CcToolchainProviderTest.java
diff options
context:
space:
mode:
authorGravatar lberki <lberki@google.com>2018-04-03 01:59:32 -0700
committerGravatar Copybara-Service <copybara-piper@google.com>2018-04-03 02:01:47 -0700
commitd92db2d4ecfee707860dca67393e91769c68fdb4 (patch)
tree26e372a0132a2adcb81c57bc1bebf9d76f99ea9c /src/test/java/com/google/devtools/build/lib/rules/cpp/CcToolchainProviderTest.java
parent6d1393d5b907f0d2c1ae6f831d44db0fa0eca06a (diff)
Remove CcToolchainProvider#getEnvironment() and all the supporting infrastructure.
This was added in unknown commit to provide a different environment to Apple toolchains, then its use removed in unknown commit in favor of getting the environment variables from the CToolchain proto. I haven't done my research if that's a better approach, but it looks like it (the less hard-coded stuff we have in Java, the better), but worst of all is surely to have *two* such mechanisms. RELNOTES: None. PiperOrigin-RevId: 191411878
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/rules/cpp/CcToolchainProviderTest.java')
-rw-r--r--src/test/java/com/google/devtools/build/lib/rules/cpp/CcToolchainProviderTest.java2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcToolchainProviderTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcToolchainProviderTest.java
index bd1fd017b8..3a8b07a08f 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcToolchainProviderTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcToolchainProviderTest.java
@@ -64,7 +64,6 @@ public class CcToolchainProviderTest {
/* builtinIncludeFiles= */ ImmutableList.<Artifact>of(),
/* coverageEnvironment= */ NestedSetBuilder.emptySet(Order.COMPILE_ORDER),
/* linkDynamicLibraryTool= */ null,
- /* environment= */ ImmutableMap.<String, String>of(),
/* builtInIncludeDirectories= */ ImmutableList.<PathFragment>of(),
/* sysroot= */ null,
FdoMode.OFF);
@@ -99,7 +98,6 @@ public class CcToolchainProviderTest {
/* builtinIncludeFiles= */ ImmutableList.<Artifact>of(),
/* coverageEnvironment= */ NestedSetBuilder.emptySet(Order.COMPILE_ORDER),
/* linkDynamicLibraryTool= */ null,
- /* environment= */ ImmutableMap.<String, String>of(),
/* builtInIncludeDirectories= */ ImmutableList.<PathFragment>of(),
/* sysroot= */ null,
FdoMode.OFF);