diff options
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/cpp')
11 files changed, 23 insertions, 28 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcImportRule.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcImportRule.java index de08305563..5f31e98462 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcImportRule.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcImportRule.java @@ -23,14 +23,13 @@ import com.google.devtools.build.lib.analysis.BaseRuleClasses; import com.google.devtools.build.lib.analysis.RuleDefinition; import com.google.devtools.build.lib.analysis.RuleDefinitionEnvironment; import com.google.devtools.build.lib.packages.RuleClass; -import com.google.devtools.build.lib.packages.RuleClass.Builder; import com.google.devtools.build.lib.packages.RuleClass.Builder.RuleClassType; import com.google.devtools.build.lib.util.FileTypeSet; /** Rule definition for the cc_import rule. */ public final class CcImportRule implements RuleDefinition { @Override - public RuleClass build(Builder builder, RuleDefinitionEnvironment env) { + public RuleClass build(RuleClass.Builder builder, RuleDefinitionEnvironment env) { return builder /*<!-- #BLAZE_RULE($cc_import).ATTRIBUTE(static_library) --> A single precompiled static library. diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLinkParamsInfo.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLinkParamsInfo.java index 7597d0ab8c..1727e8385e 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLinkParamsInfo.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLinkParamsInfo.java @@ -17,7 +17,6 @@ package com.google.devtools.build.lib.rules.cpp; import com.google.common.base.Function; import com.google.devtools.build.lib.analysis.TransitiveInfoCollection; import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable; -import com.google.devtools.build.lib.rules.cpp.CcLinkParams.Builder; import com.google.devtools.build.lib.rules.cpp.CcLinkParamsStore.CcLinkParamsStoreImpl; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec.VisibleForSerialization; @@ -55,7 +54,8 @@ public final class CcLinkParamsInfo { } @Override - protected void collect(Builder builder, boolean linkingStatically, boolean linkShared) { + protected void collect( + CcLinkParams.Builder builder, boolean linkingStatically, boolean linkShared) { for (CcLinkParamsInfo provider : providers) { builder.add(provider.getCcLinkParamsStore()); } diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLinkParamsStore.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLinkParamsStore.java index 760b4cb5a0..0ef882882e 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLinkParamsStore.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLinkParamsStore.java @@ -15,7 +15,6 @@ package com.google.devtools.build.lib.rules.cpp; import com.google.common.base.Preconditions; -import com.google.devtools.build.lib.rules.cpp.CcLinkParams.Builder; import com.google.devtools.build.lib.skyframe.serialization.ObjectCodec; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec.VisibleForSerialization; @@ -23,8 +22,9 @@ import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec. /** * A cache of C link parameters. * - * <p>The cache holds instances of {@link CcLinkParams} for combinations of linkingStatically and - * linkShared. If a requested value is not available in the cache, it is computed and then stored. + * <p>The cache holds instances of {@link com.google.devtools.build.lib.rules.cpp.CcLinkParams} for + * combinations of linkingStatically and linkShared. If a requested value is not available in the + * cache, it is computed and then stored. * * <p>Typically this class is used on targets that may be linked in as C libraries as in the * following example: @@ -59,9 +59,11 @@ public abstract class CcLinkParamsStore { } /** - * Returns {@link CcLinkParams} for a combination of parameters. + * Returns {@link com.google.devtools.build.lib.rules.cpp.CcLinkParams} for a combination of + * parameters. * - * <p>The {@link CcLinkParams} instance is computed lazily and cached. + * <p>The {@link com.google.devtools.build.lib.rules.cpp.CcLinkParams} instance is computed lazily + * and cached. */ public synchronized CcLinkParams get(boolean linkingStatically, boolean linkShared) { CcLinkParams result = lookup(linkingStatically, linkShared); @@ -116,7 +118,8 @@ public abstract class CcLinkParamsStore { new CcLinkParamsStore_EmptyCcLinkParamsStore_AutoCodec(); @Override - protected void collect(Builder builder, boolean linkingStatically, boolean linkShared) {} + protected void collect( + CcLinkParams.Builder builder, boolean linkingStatically, boolean linkShared) {} } /** An empty CcLinkParamStore. */ @@ -150,7 +153,8 @@ public abstract class CcLinkParamsStore { } @Override - protected void collect(Builder builder, boolean linkingStatically, boolean linkShared) {} + protected void collect( + CcLinkParams.Builder builder, boolean linkingStatically, boolean linkShared) {} } } diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchain.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchain.java index cfd703b2c5..77d4606f2a 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchain.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchain.java @@ -54,7 +54,6 @@ import com.google.devtools.build.lib.collect.nestedset.Order; import com.google.devtools.build.lib.events.Location; import com.google.devtools.build.lib.packages.License; import com.google.devtools.build.lib.rules.cpp.CcToolchainFeatures.Variables; -import com.google.devtools.build.lib.rules.cpp.CcToolchainFeatures.Variables.Builder; import com.google.devtools.build.lib.rules.cpp.CppConfiguration.Tool; import com.google.devtools.build.lib.rules.cpp.FdoSupport.FdoException; import com.google.devtools.build.lib.rules.cpp.FdoSupport.FdoMode; @@ -873,7 +872,7 @@ public class CcToolchain implements RuleConfiguredTargetFactory { * * <p>This method is meant to be overridden by subclasses of CcToolchain. */ - protected void addBuildVariables(RuleContext ruleContext, Builder variables) + protected void addBuildVariables(RuleContext ruleContext, Variables.Builder variables) throws RuleErrorException { // To be overridden in subclasses. } diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainRule.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainRule.java index 3369dff17d..563713933c 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainRule.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainRule.java @@ -32,7 +32,6 @@ import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.packages.Attribute.LabelLateBoundDefault; import com.google.devtools.build.lib.packages.Rule; import com.google.devtools.build.lib.packages.RuleClass; -import com.google.devtools.build.lib.packages.RuleClass.Builder; import com.google.devtools.build.lib.packages.Target; import com.google.devtools.build.lib.rules.cpp.transitions.LipoContextCollectorTransition; import com.google.devtools.build.lib.syntax.Type; @@ -69,7 +68,7 @@ public final class CcToolchainRule implements RuleDefinition { (rule, attributes, cppConfig) -> cppConfig.getFdoProfileLabel()); @Override - public RuleClass build(Builder builder, RuleDefinitionEnvironment env) { + public RuleClass build(RuleClass.Builder builder, RuleDefinitionEnvironment env) { final Label zipper = env.getToolsLabel("//tools/zip:zipper"); return builder .setUndocumented() diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainSuiteRule.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainSuiteRule.java index 55244b470a..778137c137 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainSuiteRule.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainSuiteRule.java @@ -20,7 +20,6 @@ import com.google.devtools.build.lib.analysis.RuleDefinition; import com.google.devtools.build.lib.analysis.RuleDefinitionEnvironment; import com.google.devtools.build.lib.packages.BuildType; import com.google.devtools.build.lib.packages.RuleClass; -import com.google.devtools.build.lib.packages.RuleClass.Builder; import com.google.devtools.build.lib.syntax.Type; import com.google.devtools.build.lib.util.FileTypeSet; @@ -30,7 +29,7 @@ import com.google.devtools.build.lib.util.FileTypeSet; public final class CcToolchainSuiteRule implements RuleDefinition { @Override - public RuleClass build(Builder builder, RuleDefinitionEnvironment environment) { + public RuleClass build(RuleClass.Builder builder, RuleDefinitionEnvironment environment) { return builder .setUndocumented() .add(attr("toolchains", BuildType.LABEL_DICT_UNARY) diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileAction.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileAction.java index fc363aeee4..3cd4a4ba7d 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileAction.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileAction.java @@ -78,7 +78,6 @@ import java.util.Iterator; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import java.util.UUID; import javax.annotation.Nullable; @@ -787,7 +786,7 @@ public class CppCompileAction extends AbstractAction info.addAllSourcesAndHeaders( Artifact.toExecPaths(ccCompilationContextInfo.getDeclaredIncludeSrcs())); } - for (Entry<String, String> envVariable : getEnvironment().entrySet()) { + for (Map.Entry<String, String> envVariable : getEnvironment().entrySet()) { info.addVariable( EnvironmentVariable.newBuilder() .setName(envVariable.getKey()) diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppHelper.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppHelper.java index 797e6524d0..9212fa5611 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppHelper.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppHelper.java @@ -57,7 +57,6 @@ import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder; import com.google.devtools.build.lib.collect.nestedset.Order; import com.google.devtools.build.lib.packages.RuleClass.ConfiguredTargetFactory.RuleErrorException; import com.google.devtools.build.lib.packages.RuleErrorConsumer; -import com.google.devtools.build.lib.rules.cpp.CcCompilationContextInfo.Builder; import com.google.devtools.build.lib.rules.cpp.CcLinkParams.Linkstamp; import com.google.devtools.build.lib.rules.cpp.CcToolchainFeatures.FeatureConfiguration; import com.google.devtools.build.lib.rules.cpp.CcToolchainFeatures.Tool; @@ -116,7 +115,7 @@ public class CppHelper { public static void mergeToolchainDependentCcCompilationContextInfo( RuleContext ruleContext, CcToolchainProvider toolchain, - Builder ccCompilationContextInfoBuilder) { + CcCompilationContextInfo.Builder ccCompilationContextInfoBuilder) { if (ruleContext.getRule().getAttributeDefinition(":stl") != null) { TransitiveInfoCollection stl = ruleContext.getPrerequisite(":stl", Mode.TARGET); if (stl != null) { diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionBuilder.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionBuilder.java index 6662968cb3..39222d0b20 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionBuilder.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionBuilder.java @@ -61,7 +61,6 @@ import java.util.HashMap; import java.util.LinkedHashSet; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import java.util.regex.Matcher; import javax.annotation.Nullable; @@ -1147,7 +1146,7 @@ public class CppLinkActionBuilder { } if (!isLtoIndexing) { - for (Entry<Linkstamp, Artifact> linkstampEntry : linkstampMap.entrySet()) { + for (Map.Entry<Linkstamp, Artifact> linkstampEntry : linkstampMap.entrySet()) { analysisEnvironment.registerAction( CppLinkstampCompileHelper.createLinkstampCompileAction( ruleContext, diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppRuleClasses.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppRuleClasses.java index 18bac3e672..0bd153d958 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppRuleClasses.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppRuleClasses.java @@ -41,7 +41,6 @@ import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.packages.Attribute.LabelLateBoundDefault; import com.google.devtools.build.lib.packages.ImplicitOutputsFunction.SafeImplicitOutputsFunction; import com.google.devtools.build.lib.packages.RuleClass; -import com.google.devtools.build.lib.packages.RuleClass.Builder; import com.google.devtools.build.lib.packages.RuleClass.Builder.RuleClassType; import com.google.devtools.build.lib.packages.RuleTransitionFactory; import com.google.devtools.build.lib.rules.cpp.transitions.EnableLipoTransition; @@ -391,7 +390,7 @@ public class CppRuleClasses { /** Ancestor for all rules that do include scanning. */ public static final class CcIncludeScanningRule implements RuleDefinition { @Override - public RuleClass build(Builder builder, RuleDefinitionEnvironment env) { + public RuleClass build(RuleClass.Builder builder, RuleDefinitionEnvironment env) { return builder .add( attr("$grep_includes", LABEL) diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/LibrariesToLinkCollector.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/LibrariesToLinkCollector.java index dc7fb3bc6b..7685f32fb4 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/LibrariesToLinkCollector.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/LibrariesToLinkCollector.java @@ -17,7 +17,6 @@ import com.google.common.base.Preconditions; import com.google.common.base.Strings; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; -import com.google.common.collect.ImmutableSet.Builder; import com.google.common.collect.Iterables; import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.rules.cpp.CcToolchainFeatures.FeatureConfiguration; @@ -216,8 +215,8 @@ public class LibrariesToLinkCollector { } private Pair<Boolean, Boolean> addLinkerInputs( - Builder<String> librarySearchDirectories, - Builder<String> rpathEntries, + ImmutableSet.Builder<String> librarySearchDirectories, + ImmutableSet.Builder<String> rpathEntries, SequenceBuilder librariesToLink) { boolean includeSolibDir = false; boolean includeToolchainLibrariesSolibDir = false; |