commit d8598b56254847a080b45f50f3b8f0b2642e8b28
author hlopko <hlopko@google.com> Tue Sep 04 08:58:22 2018 -0700
committer Copybara-Service <copybara-piper@google.com> Tue Sep 04 09:00:37 2018 -0700
tree 39f7ac3e775a4959d73924085ee5b81285ab7082
parent 6a4b15178226b35c17ad5e25fec72f08a598e5b1

Remove ccTargetOs, it's not needed anymore

#6072.

RELNOTES: None.
PiperOrigin-RevId: 211464711

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

diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java
index fc37f5c..16b80b2 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java
@@ -92,26 +92,6 @@
   /** String constant for CC_FLAGS make variable name */
   public static final String CC_FLAGS_MAKE_VARIABLE_NAME = "CC_FLAGS";
 
-  public boolean disableLegacyCrosstoolFields() {
-    return cppOptions.disableLegacyCrosstoolFields;
-  }
-
-  public boolean disableCompilationModeFlags() {
-    return cppOptions.disableCompilationModeFlags;
-  }
-
-  public boolean disableLinkingModeFlags() {
-    return cppOptions.disableLinkingModeFlags;
-  }
-
-  public boolean enableLinkoptsInUserLinkFlags() {
-    return cppOptions.enableLinkoptsInUserLinkFlags;
-  }
-
-  public boolean disableEmittingStaticLibgcc() {
-    return cppOptions.disableEmittingStaticLibgcc;
-  }
-
   /**
    * An enumeration of all the tools that comprise a toolchain.
    */
@@ -476,17 +456,6 @@
   }
 
   /**
-   * Unused, for compatibility with things internal to Google.
-   *
-   * <p>Deprecated: Use platforms.
-   */
-  // TODO(b/64384912): Remove once c++ platforms are in use.
-  @Deprecated
-  public String getTargetOS() {
-    return cppToolchainInfo.getTargetOS();
-  }
-
-  /**
    * Returns the path fragment that is either absolute or relative to the execution root that can be
    * used to execute the given tool.
    *
@@ -1154,8 +1123,7 @@
   public Map<String, Object> lateBoundOptionDefaults() {
     // --compiler initially defaults to null because its *actual* default isn't known
     // until it's read from the CROSSTOOL. Feed the CROSSTOOL defaults in here.
-    return ImmutableMap.<String, Object>of(
-        "compiler", cppToolchainInfo.getCompiler());
+    return ImmutableMap.of("compiler", cppToolchainInfo.getCompiler());
   }
 
   public String getFdoInstrument() {
@@ -1186,6 +1154,26 @@
     return cppOptions.useLLVMCoverageMapFormat;
   }
 
+  public boolean disableLegacyCrosstoolFields() {
+    return cppOptions.disableLegacyCrosstoolFields;
+  }
+
+  public boolean disableCompilationModeFlags() {
+    return cppOptions.disableCompilationModeFlags;
+  }
+
+  public boolean disableLinkingModeFlags() {
+    return cppOptions.disableLinkingModeFlags;
+  }
+
+  public boolean enableLinkoptsInUserLinkFlags() {
+    return cppOptions.enableLinkoptsInUserLinkFlags;
+  }
+
+  public boolean disableEmittingStaticLibgcc() {
+    return cppOptions.disableEmittingStaticLibgcc;
+  }
+
   /** Returns true if the deprecated CcDynamicLibrariesForRuntime class should be used */
   public boolean enableCcDynamicLibrariesForRuntime() {
     return cppOptions.enableCcDynamicLibrariesForRuntime;