Remove a few unused fields from CrosstoolInfo.

RELNOTES: None.
PiperOrigin-RevId: 205046100

1 files changed, 0 insertions, 30 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CrosstoolInfo.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CrosstoolInfo.java
index 5b64ee6b22..1ea9950b28 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CrosstoolInfo.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CrosstoolInfo.java
@@ -41,8 +41,6 @@ public class CrosstoolInfo extends NativeInfo {
   private final ImmutableList<ArtifactNamePattern> artifactNamePatterns;
   private final ImmutableList<String> cxxBuiltinIncludeDirectories;
 
-  private final String majorVersion;
-  private final String minorVersion;
   private final String toolchainIdentifier;
   private final String hostSystemName;
   private final String targetSystemName;
@@ -85,7 +83,6 @@ public class CrosstoolInfo extends NativeInfo {
   private final ImmutableList<Pair<String, String>> makeVariables;
   private final String builtinSysroot;
   private final String defaultGrteTop;
-  private final ImmutableList<String> debianExtraRequires;
   private final String ccTargetOs;
   private final boolean hasDynamicLinkingModeFlags;
 
@@ -95,8 +92,6 @@ public class CrosstoolInfo extends NativeInfo {
       ImmutableList<Feature> features,
       ImmutableList<ArtifactNamePattern> artifactNamePatterns,
       ImmutableList<String> cxxBuiltinIncludeDirectories,
-      String majorVersion,
-      String minorVersion,
       String toolchainIdentifier,
       String hostSystemName,
       String targetSystemName,
@@ -139,7 +134,6 @@ public class CrosstoolInfo extends NativeInfo {
       ImmutableList<Pair<String, String>> makeVariables,
       String builtinSysroot,
       String defaultGrteTop,
-      ImmutableList<String> debianExtraRequires,
       String ccTargetOs,
       boolean hasDynamicLinkingModeFlags) {
     super(PROVIDER);
@@ -147,8 +141,6 @@ public class CrosstoolInfo extends NativeInfo {
     this.features = features;
     this.artifactNamePatterns = artifactNamePatterns;
     this.cxxBuiltinIncludeDirectories = cxxBuiltinIncludeDirectories;
-    this.majorVersion = majorVersion;
-    this.minorVersion = minorVersion;
     this.toolchainIdentifier = toolchainIdentifier;
     this.hostSystemName = hostSystemName;
     this.targetSystemName = targetSystemName;
@@ -191,7 +183,6 @@ public class CrosstoolInfo extends NativeInfo {
     this.makeVariables = makeVariables;
     this.builtinSysroot = builtinSysroot;
     this.defaultGrteTop = defaultGrteTop;
-    this.debianExtraRequires = debianExtraRequires;
     this.ccTargetOs = ccTargetOs;
     this.hasDynamicLinkingModeFlags = hasDynamicLinkingModeFlags;
   }
@@ -277,8 +268,6 @@ public class CrosstoolInfo extends NativeInfo {
         featureBuilder.build(),
         artifactNamePatternBuilder.build(),
         ImmutableList.copyOf(toolchain.getCxxBuiltinIncludeDirectoryList()),
-        file.getMajorVersion(),
-        file.getMinorVersion(),
         toolchain.getToolchainIdentifier(),
         toolchain.getHostSystemName(),
         toolchain.getTargetSystemName(),
@@ -329,7 +318,6 @@ public class CrosstoolInfo extends NativeInfo {
             .collect(ImmutableList.toImmutableList()),
         toolchain.getBuiltinSysroot(),
         toolchain.getDefaultGrteTop(),
-        ImmutableList.copyOf(toolchain.getDebianExtraRequiresList()),
         toolchain.getCcTargetOs(),
         hasDynamicLinkingModeFlags);
   }
@@ -352,18 +340,6 @@ public class CrosstoolInfo extends NativeInfo {
 
   // TODO(b/65151735): Remove once this field is migrated to features.
   @Deprecated
-  public String getMajorVersion() {
-    return majorVersion;
-  }
-
-  // TODO(b/65151735): Remove once this field is migrated to features.
-  @Deprecated
-  public String getMinorVersion() {
-    return minorVersion;
-  }
-
-  // TODO(b/65151735): Remove once this field is migrated to features.
-  @Deprecated
   public String getToolchainIdentifier() {
     return toolchainIdentifier;
   }
@@ -564,12 +540,6 @@ public class CrosstoolInfo extends NativeInfo {
 
   // TODO(b/65151735): Remove once this field is migrated to features.
   @Deprecated
-  public ImmutableList<String> getDebianExtraRequires() {
-    return debianExtraRequires;
-  }
-
-  // TODO(b/65151735): Remove once this field is migrated to features.
-  @Deprecated
   public ImmutableList<String> getOptCompilationModeCompilerFlags() {
     return optCompilationModeCompilerFlags;
   }