Remove ccTargetOs, it's not needed anymore
RELNOTES: None.
@@ -92,26 +92,6 @@ public final class CppConfiguration extends BuildConfiguration.Fragment
/** 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.
*/
@@ -475,17 +455,6 @@ public final class CppConfiguration extends BuildConfiguration.Fragment
return cppToolchainInfo.getTargetCpu();
}
- /**
- * 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 final class CppConfiguration extends BuildConfiguration.Fragment
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 @@ public final class CppConfiguration extends BuildConfiguration.Fragment
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;
