diff options
| author |  lberki <lberki@google.com> | 2018-03-13 06:03:11 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-03-13 06:05:30 -0700 |
| commit | b3cf83cd20f30d77e6768de651a3e652f86d6f78 (patch) | |
| tree | 1f390652565c0bb7d1342962de9b6f8640add917 /src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainProvider.java | |
| parent | d95f1bf6ecca600096465dc858e0862b6539c46c (diff) | |
Make DeployArchiveBuilder fetch the C++ toolchain identifier through
CcToolchainProvider instead of BuildConfiguration.
This is a step towards removing BuildConfiguration#getPlatformName().
RELNOTES: None.
PiperOrigin-RevId: 188862029
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainProvider.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainProvider.java | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainProvider.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainProvider.java index 1b6ae1aa6e..13c9166f35 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainProvider.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainProvider.java @@ -13,7 +13,6 @@ // limitations under the License. package com.google.devtools.build.lib.rules.cpp; -import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Function; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; @@ -265,10 +264,9 @@ public final class CcToolchainProvider extends ToolchainInfo { return builtInIncludeDirectories; } - /** Returns the {@link CToolchain} for this toolchain. */ - @VisibleForTesting - public CToolchain getToolchain() { - return toolchainInfo.getToolchain(); + /** Returns the identifier of the toolchain as specified in the {@code CToolchain} proto. */ + public String getToolchainIdentifier() { + return toolchainInfo.getToolchainIdentifier(); } /** |