Skip to content

Commit f56dd36

Browse files
pzembrodcopybara-github
authored andcommitted
Remove unused methods from CppHelper. PR#24009 (bazelbuild@c3346a5) removed their last use.
PiperOrigin-RevId: 695707919 Change-Id: Ib6ca473152b71d5f55e80d874449d01568f38390
1 parent a5b6c30 commit f56dd36

File tree

1 file changed

+0
-45
lines changed

1 file changed

+0
-45
lines changed

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

Lines changed: 0 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -14,39 +14,29 @@
1414

1515
package com.google.devtools.build.lib.rules.cpp;
1616

17-
import static com.google.devtools.build.lib.packages.BuildType.LABEL_LIST;
18-
19-
import com.google.common.collect.ImmutableCollection;
2017
import com.google.common.collect.ImmutableList;
2118
import com.google.common.collect.ImmutableMap;
2219
import com.google.devtools.build.lib.actions.Artifact;
2320
import com.google.devtools.build.lib.actions.Artifact.SpecialArtifact;
2421
import com.google.devtools.build.lib.actions.FailAction;
2522
import com.google.devtools.build.lib.actions.PathMapper;
26-
import com.google.devtools.build.lib.analysis.AliasProvider;
2723
import com.google.devtools.build.lib.analysis.AnalysisUtils;
28-
import com.google.devtools.build.lib.analysis.Expander;
29-
import com.google.devtools.build.lib.analysis.FileProvider;
3024
import com.google.devtools.build.lib.analysis.RuleContext;
3125
import com.google.devtools.build.lib.analysis.RuleErrorConsumer;
32-
import com.google.devtools.build.lib.analysis.TransitiveInfoCollection;
3326
import com.google.devtools.build.lib.analysis.actions.ActionConstructionContext;
3427
import com.google.devtools.build.lib.analysis.config.BuildConfigurationValue;
3528
import com.google.devtools.build.lib.analysis.config.CompilationMode;
3629
import com.google.devtools.build.lib.analysis.platform.ToolchainInfo;
3730
import com.google.devtools.build.lib.cmdline.Label;
3831
import com.google.devtools.build.lib.packages.Info;
3932
import com.google.devtools.build.lib.packages.RuleClass.ConfiguredTargetFactory.RuleErrorException;
40-
import com.google.devtools.build.lib.packages.Types;
4133
import com.google.devtools.build.lib.rules.cpp.CcToolchainFeatures.ExpansionException;
4234
import com.google.devtools.build.lib.rules.cpp.CcToolchainFeatures.FeatureConfiguration;
4335
import com.google.devtools.build.lib.rules.cpp.CppLinkActionBuilder.LinkActionConstruction;
4436
import com.google.devtools.build.lib.rules.cpp.Link.LinkTargetType;
4537
import com.google.devtools.build.lib.server.FailureDetails.FailAction.Code;
4638
import com.google.devtools.build.lib.vfs.FileSystemUtils;
4739
import com.google.devtools.build.lib.vfs.PathFragment;
48-
import java.util.ArrayList;
49-
import java.util.List;
5040
import javax.annotation.Nullable;
5141
import net.starlark.java.eval.EvalException;
5242

@@ -74,41 +64,6 @@ private CppHelper() {
7464
// prevents construction
7565
}
7666

77-
/** Tokenizes and expands make variables. */
78-
public static List<String> expandLinkopts(
79-
RuleContext ruleContext, String attrName, Iterable<String> values)
80-
throws InterruptedException {
81-
List<String> result = new ArrayList<>();
82-
ImmutableMap.Builder<Label, ImmutableCollection<Artifact>> builder = ImmutableMap.builder();
83-
84-
if (ruleContext.attributes().has("additional_linker_inputs", LABEL_LIST)) {
85-
for (TransitiveInfoCollection current :
86-
ruleContext.getPrerequisites("additional_linker_inputs")) {
87-
builder.put(
88-
AliasProvider.getDependencyLabel(current),
89-
current.getProvider(FileProvider.class).getFilesToBuild().toList());
90-
}
91-
}
92-
93-
Expander expander = ruleContext.getExpander(builder.buildOrThrow()).withDataExecLocations();
94-
for (String value : values) {
95-
expander.tokenizeAndExpandMakeVars(result, attrName, value);
96-
}
97-
return result;
98-
}
99-
100-
/** Returns the linkopts for the rule context. */
101-
public static ImmutableList<String> getLinkopts(RuleContext ruleContext)
102-
throws InterruptedException {
103-
if (ruleContext.attributes().has("linkopts", Types.STRING_LIST)) {
104-
Iterable<String> linkopts = ruleContext.attributes().get("linkopts", Types.STRING_LIST);
105-
if (linkopts != null) {
106-
return ImmutableList.copyOf(expandLinkopts(ruleContext, "linkopts", linkopts));
107-
}
108-
}
109-
return ImmutableList.of();
110-
}
111-
11267
/** Returns C++ toolchain, using toolchain resolution */
11368
public static CcToolchainProvider getToolchain(RuleContext ruleContext)
11469
throws RuleErrorException {

0 commit comments

Comments
 (0)