Delete CcToolchainConfigInfo.proto

PiperOrigin-RevId: 792195826
Change-Id: I23da70add656315a42c1e4ff3ec9573da494f78d

Author: hvadehra

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

@@ -19,27 +19,15 @@
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
 import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable;
 import com.google.devtools.build.lib.packages.BuiltinProvider;
 import com.google.devtools.build.lib.packages.NativeInfo;
 import com.google.devtools.build.lib.rules.cpp.CcToolchainFeatures.ActionConfig;
 import com.google.devtools.build.lib.rules.cpp.CcToolchainFeatures.ArtifactNamePatternMapper;
-import com.google.devtools.build.lib.rules.cpp.CcToolchainFeatures.EnvEntry;
-import com.google.devtools.build.lib.rules.cpp.CcToolchainFeatures.EnvSet;
 import com.google.devtools.build.lib.rules.cpp.CcToolchainFeatures.Feature;
-import com.google.devtools.build.lib.rules.cpp.CcToolchainFeatures.Flag.SingleChunkFlag;
-import com.google.devtools.build.lib.rules.cpp.CcToolchainFeatures.FlagGroup;
-import com.google.devtools.build.lib.rules.cpp.CcToolchainFeatures.FlagSet;
-import com.google.devtools.build.lib.rules.cpp.CcToolchainFeatures.Tool;
-import com.google.devtools.build.lib.rules.cpp.CcToolchainFeatures.VariableWithValue;
-import com.google.devtools.build.lib.rules.cpp.CcToolchainFeatures.WithFeatureSet;
-import com.google.devtools.build.lib.rules.cpp.CcToolchainVariables.Expandable;
 import com.google.devtools.build.lib.starlarkbuildapi.cpp.CcToolchainConfigInfoApi;
 import com.google.devtools.build.lib.util.Pair;
-import com.google.devtools.build.lib.view.config.crosstool.CrosstoolConfig;
 import com.google.devtools.build.lib.view.config.crosstool.CrosstoolConfig.CToolchain;
-import com.google.devtools.build.lib.view.config.crosstool.CrosstoolConfig.ToolPath;
 import java.util.List;
 import net.starlark.java.annot.StarlarkMethod;
 import net.starlark.java.eval.EvalException;
@@ -298,205 +286,6 @@ public String getBuiltinSysroot() {
     return builtinSysroot;
   }
 
-  @Override
-  public String getProto() {
-    CToolchain.Builder cToolchain = CToolchain.newBuilder();
-    cToolchain.addAllFeature(
-        features.stream()
-            .map(feature -> featureToProto(feature))
-            .collect(ImmutableList.toImmutableList()));
-    cToolchain.addAllActionConfig(
-        actionConfigs.stream()
-            .map(actionConfig -> actionConfigToProto(actionConfig))
-            .collect(ImmutableList.toImmutableList()));
-    cToolchain.addAllArtifactNamePattern(
-        artifactNamePatterns.asImmutableMap().entrySet().stream()
-            .map(
-                entry ->
-                    CToolchain.ArtifactNamePattern.newBuilder()
-                        .setCategoryName(entry.getKey().getCategoryName())
-                        .setPrefix(entry.getValue().getPrefix())
-                        .setExtension(entry.getValue().getExtension())
-                        .build())
-            .collect(ImmutableList.toImmutableList()));
-    cToolchain.addAllToolPath(
-        toolPaths.stream()
-            .map(
-                toolPath ->
-                    ToolPath.newBuilder()
-                        .setName(toolPath.getFirst())
-                        .setPath(toolPath.getSecond())
-                        .build())
-            .collect(ImmutableList.toImmutableList()));
-    cToolchain.addAllMakeVariable(
-        makeVariables.stream()
-            .map(
-                makeVariable ->
-                    CrosstoolConfig.MakeVariable.newBuilder()
-                        .setName(makeVariable.getFirst())
-                        .setValue(makeVariable.getSecond())
-                        .build())
-            .collect(ImmutableList.toImmutableList()));
-    cToolchain
-        .addAllCxxBuiltinIncludeDirectory(cxxBuiltinIncludeDirectories)
-        .setToolchainIdentifier(toolchainIdentifier)
-        .setHostSystemName(hostSystemName)
-        .setTargetSystemName(targetSystemName)
-        .setTargetCpu(targetCpu)
-        .setTargetLibc(targetLibc)
-        .setCompiler(compiler)
-        .setAbiVersion(abiVersion)
-        .setAbiLibcVersion(abiLibcVersion);
-    if (!builtinSysroot.isEmpty()) {
-      cToolchain.setBuiltinSysroot(builtinSysroot);
-    }
-    return cToolchain.build().toString();
-  }
-
-  private static CToolchain.WithFeatureSet withFeatureSetToProto(WithFeatureSet withFeatureSet) {
-    return CToolchain.WithFeatureSet.newBuilder()
-        .addAllFeature(withFeatureSet.getFeatures())
-        .addAllNotFeature(withFeatureSet.getNotFeatures())
-        .build();
-  }
-
-  private static CToolchain.EnvEntry envEntryToProto(EnvEntry envEntry) {
-    return CToolchain.EnvEntry.newBuilder()
-        .setKey(envEntry.getKey())
-        .setValue(envEntry.getValue())
-        .build();
-  }
-
-  private static CToolchain.EnvSet envSetToProto(EnvSet envSet) {
-    return CToolchain.EnvSet.newBuilder()
-        .addAllAction(envSet.getActions())
-        .addAllEnvEntry(
-            envSet.getEnvEntries().stream()
-                .map(envEntry -> envEntryToProto(envEntry))
-                .collect(ImmutableList.toImmutableList()))
-        .addAllWithFeature(
-            envSet.getWithFeatureSets().stream()
-                .map(withFeatureSet -> withFeatureSetToProto(withFeatureSet))
-                .collect(ImmutableList.toImmutableList()))
-        .build();
-  }
-
-  private static CToolchain.FlagGroup flagGroupToProto(FlagGroup flagGroup) {
-    ImmutableList.Builder<CToolchain.FlagGroup> flagGroups = ImmutableList.builder();
-    ImmutableList.Builder<String> flags = ImmutableList.builder();
-    for (Expandable expandable : flagGroup.getExpandables()) {
-      if (expandable instanceof FlagGroup expandableFlagGroup) {
-        flagGroups.add(flagGroupToProto(expandableFlagGroup));
-      } else if (expandable instanceof SingleChunkFlag singleChunkFlag) {
-        flags.add(singleChunkFlag.getString());
-      } else if (expandable instanceof CcToolchainFeatures.Flag) {
-        flags.add(((CcToolchainFeatures.Flag) expandable).getString());
-      } else {
-        throw new IllegalStateException("Unexpected subclass of Expandable.");
-      }
-    }
-
-    CToolchain.FlagGroup.Builder flagGroupBuilder = CToolchain.FlagGroup.newBuilder();
-    if (flagGroup.getIterateOverVariable() != null) {
-      flagGroupBuilder.setIterateOver(flagGroup.getIterateOverVariable());
-    }
-    if (flagGroup.getExpandIfTrue() != null) {
-      flagGroupBuilder.setExpandIfTrue(flagGroup.getExpandIfTrue());
-    }
-    if (flagGroup.getExpandIfFalse() != null) {
-      flagGroupBuilder.setExpandIfFalse(flagGroup.getExpandIfFalse());
-    }
-    if (flagGroup.getExpandIfEqual() != null) {
-      flagGroupBuilder.setExpandIfEqual(variableWithValueFromProto(flagGroup.getExpandIfEqual()));
-    }
-    return flagGroupBuilder
-        .addAllExpandIfAllAvailable(flagGroup.getExpandIfAllAvailable())
-        .addAllExpandIfNoneAvailable(flagGroup.getExpandIfNoneAvailable())
-        .addAllFlagGroup(flagGroups.build())
-        .addAllFlag(flags.build())
-        .build();
-  }
-
-  private static CToolchain.VariableWithValue variableWithValueFromProto(
-      VariableWithValue variable) {
-    return CToolchain.VariableWithValue.newBuilder()
-        .setValue(variable.getValue())
-        .setVariable(variable.getVariable())
-        .build();
-  }
-
-  private static CToolchain.Feature featureToProto(Feature feature) {
-    return CToolchain.Feature.newBuilder()
-        .setName(feature.getName())
-        .setEnabled(feature.isEnabled())
-        .addAllFlagSet(
-            feature.getFlagSets().stream()
-                .map(flagSet -> flagSetToProto(flagSet, /* forActionConfig= */ false))
-                .collect(ImmutableList.toImmutableList()))
-        .addAllEnvSet(
-            feature.getEnvSets().stream()
-                .map(envSet -> envSetToProto(envSet))
-                .collect(ImmutableList.toImmutableList()))
-        .addAllRequires(
-            feature.getRequires().stream()
-                .map(featureSet -> featureSetToProto(featureSet))
-                .collect(ImmutableList.toImmutableList()))
-        .addAllImplies(feature.getImplies())
-        .addAllProvides(feature.getProvides())
-        .build();
-  }
-
-  private static CToolchain.FlagSet flagSetToProto(FlagSet flagSet, boolean forActionConfig) {
-    CToolchain.FlagSet.Builder flagSetBuilder =
-        CToolchain.FlagSet.newBuilder()
-            .addAllFlagGroup(
-                flagSet.getFlagGroups().stream()
-                    .map(flagGroup -> flagGroupToProto(flagGroup))
-                    .collect(ImmutableList.toImmutableList()))
-            .addAllWithFeature(
-                flagSet.getWithFeatureSets().stream()
-                    .map(withFeatureSet -> withFeatureSetToProto(withFeatureSet))
-                    .collect(ImmutableList.toImmutableList()))
-            .addAllExpandIfAllAvailable(flagSet.getExpandIfAllAvailable());
-    if (!forActionConfig) {
-      flagSetBuilder.addAllAction(flagSet.getActions());
-    }
-    return flagSetBuilder.build();
-  }
-
-  private static CToolchain.FeatureSet featureSetToProto(ImmutableSet<String> features) {
-    return CToolchain.FeatureSet.newBuilder().addAllFeature(features).build();
-  }
-
-  private static CToolchain.Tool toolToProto(Tool tool) {
-    return CToolchain.Tool.newBuilder()
-        .setToolPath(tool.getToolPathFragment().toString())
-        .setToolPathOrigin(tool.getToolPathOrigin())
-        .addAllWithFeature(
-            tool.getWithFeatureSetSets().stream()
-                .map(withFeatureSet -> withFeatureSetToProto(withFeatureSet))
-                .collect(ImmutableList.toImmutableList()))
-        .addAllExecutionRequirement(tool.getExecutionRequirements())
-        .build();
-  }
-
-  private static CToolchain.ActionConfig actionConfigToProto(ActionConfig actionConfig) {
-    return CToolchain.ActionConfig.newBuilder()
-        .setConfigName(actionConfig.getName())
-        .setActionName(actionConfig.getActionName())
-        .setEnabled(actionConfig.isEnabled())
-        .addAllTool(
-            actionConfig.getTools().stream()
-                .map(tool -> toolToProto(tool))
-                .collect(ImmutableList.toImmutableList()))
-        .addAllFlagSet(
-            actionConfig.getFlagSets().stream()
-                .map(flagSet -> flagSetToProto(flagSet, /* forActionConfig= */ true))
-                .collect(ImmutableList.toImmutableList()))
-        .addAllImplies(actionConfig.getImplies())
-        .build();
-  }
-
   /** Provider class for {@link CcToolchainConfigInfo} objects. */
   public static class Provider extends BuiltinProvider<CcToolchainConfigInfo>
       implements CcToolchainConfigInfoApi.Provider {

src/main/java/com/google/devtools/build/lib/starlarkbuildapi/cpp/CcToolchainConfigInfoApi.java

@@ -18,7 +18,6 @@
 import com.google.devtools.build.lib.starlarkbuildapi.core.ProviderApi;
 import com.google.devtools.build.lib.starlarkbuildapi.core.StructApi;
 import net.starlark.java.annot.StarlarkBuiltin;
-import net.starlark.java.annot.StarlarkMethod;
 
 /** Additional layer of configurability for c++ rules through features and actions. */
 @StarlarkBuiltin(
@@ -30,12 +29,6 @@
             + "configure the C++ toolchain, and later on for command line construction. "
             + "Replaces the functionality of CROSSTOOL file.")
 public interface CcToolchainConfigInfoApi extends StructApi {
-  @StarlarkMethod(
-      name = "proto",
-      doc = "Returns CToolchain text proto from the CcToolchainConfigInfo data.",
-      structField = true)
-  String getProto();
-
   /** Provider class for {@link CcToolchainConfigInfoApi} objects. */
   @StarlarkBuiltin(
       name = "Provider",