Rename OutputGroupProvider -> OutputGroupInfo.
RELNOTES: None
PiperOrigin-RevId: 179046403
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java b/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java
index 008d137..0674cfa 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java
@@ -832,8 +832,8 @@
Collection<ConfiguredTarget> targetsToTestExclusive, TopLevelArtifactContext topLevelOptions,
Collection<ConfiguredTarget> allTestTargets) {
Set<String> outputGroups = topLevelOptions.outputGroups();
- if (!outputGroups.contains(OutputGroupProvider.FILES_TO_COMPILE)
- && !outputGroups.contains(OutputGroupProvider.COMPILATION_PREREQUISITES)
+ if (!outputGroups.contains(OutputGroupInfo.FILES_TO_COMPILE)
+ && !outputGroups.contains(OutputGroupInfo.COMPILATION_PREREQUISITES)
&& allTestTargets != null) {
scheduleTests(targetsToTest, targetsToTestExclusive, allTestTargets,
topLevelOptions.runTestsExclusively());
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredAspect.java b/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredAspect.java
index 1575a48..fcf06d8f 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredAspect.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredAspect.java
@@ -102,8 +102,8 @@
}
public Object get(String legacyKey) {
- if (OutputGroupProvider.SKYLARK_NAME.equals(legacyKey)) {
- return get(OutputGroupProvider.SKYLARK_CONSTRUCTOR.getKey());
+ if (OutputGroupInfo.SKYLARK_NAME.equals(legacyKey)) {
+ return get(OutputGroupInfo.SKYLARK_CONSTRUCTOR.getKey());
}
return providers.getProvider(legacyKey);
}
@@ -235,11 +235,11 @@
outputGroups.put(entry.getKey(), entry.getValue().build());
}
- if (providers.contains(OutputGroupProvider.SKYLARK_CONSTRUCTOR.getKey())) {
+ if (providers.contains(OutputGroupInfo.SKYLARK_CONSTRUCTOR.getKey())) {
throw new IllegalStateException(
- "OutputGroupProvider was provided explicitly; do not use addOutputGroup");
+ "OutputGroupInfo was provided explicitly; do not use addOutputGroup");
}
- addDeclaredProvider(new OutputGroupProvider(outputGroups.build()));
+ addDeclaredProvider(new OutputGroupInfo(outputGroups.build()));
}
addProvider(
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/OutputGroupProvider.java b/src/main/java/com/google/devtools/build/lib/analysis/OutputGroupInfo.java
similarity index 90%
rename from src/main/java/com/google/devtools/build/lib/analysis/OutputGroupProvider.java
rename to src/main/java/com/google/devtools/build/lib/analysis/OutputGroupInfo.java
index 7c2dd75..8c313d0 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/OutputGroupProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/OutputGroupInfo.java
@@ -57,11 +57,11 @@
* not mentioned on the output.
*/
@Immutable
-public final class OutputGroupProvider extends NativeInfo
+public final class OutputGroupInfo extends NativeInfo
implements SkylarkIndexable, Iterable<String> {
public static final String SKYLARK_NAME = "output_groups";
- public static NativeProvider<OutputGroupProvider> SKYLARK_CONSTRUCTOR = new Constructor();
+ public static NativeProvider<OutputGroupInfo> SKYLARK_CONSTRUCTOR = new Constructor();
/**
* Prefix for output groups that are not reported to the user on the terminal output of Blaze when
@@ -120,19 +120,19 @@
private final ImmutableMap<String, NestedSet<Artifact>> outputGroups;
- public OutputGroupProvider(ImmutableMap<String, NestedSet<Artifact>> outputGroups) {
+ public OutputGroupInfo(ImmutableMap<String, NestedSet<Artifact>> outputGroups) {
super(SKYLARK_CONSTRUCTOR, ImmutableMap.<String, Object>of());
this.outputGroups = outputGroups;
}
@Nullable
- public static OutputGroupProvider get(TransitiveInfoCollection collection) {
- return collection.get(OutputGroupProvider.SKYLARK_CONSTRUCTOR);
+ public static OutputGroupInfo get(TransitiveInfoCollection collection) {
+ return collection.get(OutputGroupInfo.SKYLARK_CONSTRUCTOR);
}
@Nullable
- public static OutputGroupProvider get(ConfiguredAspect aspect) {
- return (OutputGroupProvider) aspect.get(SKYLARK_CONSTRUCTOR.getKey());
+ public static OutputGroupInfo get(ConfiguredAspect aspect) {
+ return (OutputGroupInfo) aspect.get(SKYLARK_CONSTRUCTOR.getKey());
}
@@ -153,7 +153,7 @@
* @param providers providers to merge {@code this} with.
*/
@Nullable
- public static OutputGroupProvider merge(List<OutputGroupProvider> providers)
+ public static OutputGroupInfo merge(List<OutputGroupInfo> providers)
throws DuplicateException {
if (providers.size() == 0) {
return null;
@@ -164,7 +164,7 @@
ImmutableMap.Builder<String, NestedSet<Artifact>> resultBuilder = new ImmutableMap.Builder<>();
Set<String> seenGroups = new HashSet<>();
- for (OutputGroupProvider provider : providers) {
+ for (OutputGroupInfo provider : providers) {
for (String outputGroup : provider.outputGroups.keySet()) {
if (!seenGroups.add(outputGroup)) {
throw new DuplicateException(
@@ -174,7 +174,7 @@
resultBuilder.put(outputGroup, provider.getOutputGroup(outputGroup));
}
}
- return new OutputGroupProvider(resultBuilder.build());
+ return new OutputGroupInfo(resultBuilder.build());
}
public static ImmutableSortedSet<String> determineOutputGroups(List<String> outputGroups) {
@@ -256,15 +256,15 @@
return outputGroups.keySet();
}
- /** A constructor callable from Skylark for OutputGroupProvider. */
- private static class Constructor extends NativeProvider<OutputGroupProvider> {
+ /** A constructor callable from Skylark for OutputGroupInfo. */
+ private static class Constructor extends NativeProvider<OutputGroupInfo> {
private Constructor() {
- super(OutputGroupProvider.class, "OutputGroupInfo");
+ super(OutputGroupInfo.class, "OutputGroupInfo");
}
@Override
- protected OutputGroupProvider createInstanceFromSkylark(Object[] args, Location loc)
+ protected OutputGroupInfo createInstanceFromSkylark(Object[] args, Location loc)
throws EvalException {
@SuppressWarnings("unchecked")
@@ -277,7 +277,7 @@
SkylarkRuleConfiguredTargetUtil.convertToOutputGroupValue(
loc, entry.getKey(), entry.getValue()));
}
- return new OutputGroupProvider(builder.build());
+ return new OutputGroupInfo(builder.build());
}
@Override
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/RuleConfiguredTargetBuilder.java b/src/main/java/com/google/devtools/build/lib/analysis/RuleConfiguredTargetBuilder.java
index 38dd03a..8f53a9b 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/RuleConfiguredTargetBuilder.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/RuleConfiguredTargetBuilder.java
@@ -102,7 +102,7 @@
if (runfilesSupport != null) {
// If a binary is built, build its runfiles, too
- addOutputGroup(OutputGroupProvider.HIDDEN_TOP_LEVEL, runfilesMiddlemen);
+ addOutputGroup(OutputGroupInfo.HIDDEN_TOP_LEVEL, runfilesMiddlemen);
} else if (providersBuilder.contains(RunfilesProvider.class)) {
// If we don't have a RunfilesSupport (probably because this is not a binary rule), we still
// want to build the files this rule contributes to runfiles of dependent rules so that we
@@ -112,7 +112,7 @@
// specific *RunfilesProvider classes, which we don't add here for reasons that are lost in
// the mists of time.
addOutputGroup(
- OutputGroupProvider.HIDDEN_TOP_LEVEL,
+ OutputGroupInfo.HIDDEN_TOP_LEVEL,
providersBuilder
.getProvider(RunfilesProvider.class)
.getDefaultRunfiles()
@@ -136,8 +136,8 @@
outputGroups.put(entry.getKey(), entry.getValue().build());
}
- OutputGroupProvider outputGroupProvider = new OutputGroupProvider(outputGroups.build());
- addNativeDeclaredProvider(outputGroupProvider);
+ OutputGroupInfo outputGroupInfo = new OutputGroupInfo(outputGroups.build());
+ addNativeDeclaredProvider(outputGroupInfo);
}
TransitiveInfoProviderMap providers = providersBuilder.build();
@@ -286,7 +286,7 @@
* Adds a "declared provider" defined in Skylark to the rule. Use this method for declared
* providers defined in Skyark.
*
- * <p>Has special handling for {@link OutputGroupProvider}: that provider is not added from
+ * <p>Has special handling for {@link OutputGroupInfo}: that provider is not added from
* Skylark directly, instead its outpuyt groups are added.
*
* <p>Use {@link #addNativeDeclaredProvider(Info)} in definitions of native rules.
@@ -298,10 +298,10 @@
throw new EvalException(constructor.getLocation(),
"All providers must be top level values");
}
- if (OutputGroupProvider.SKYLARK_CONSTRUCTOR.getKey().equals(constructor.getKey())) {
- OutputGroupProvider outputGroupProvider = (OutputGroupProvider) provider;
- for (String outputGroup : outputGroupProvider) {
- addOutputGroup(outputGroup, outputGroupProvider.getOutputGroup(outputGroup));
+ if (OutputGroupInfo.SKYLARK_CONSTRUCTOR.getKey().equals(constructor.getKey())) {
+ OutputGroupInfo outputGroupInfo = (OutputGroupInfo) provider;
+ for (String outputGroup : outputGroupInfo) {
+ addOutputGroup(outputGroup, outputGroupInfo.getOutputGroup(outputGroup));
}
} else {
providersBuilder.put(provider);
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/TopLevelArtifactHelper.java b/src/main/java/com/google/devtools/build/lib/analysis/TopLevelArtifactHelper.java
index 12584c3..bb71490 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/TopLevelArtifactHelper.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/TopLevelArtifactHelper.java
@@ -169,7 +169,7 @@
public static ArtifactsToBuild getAllArtifactsToBuild(TransitiveInfoCollection target,
TopLevelArtifactContext context) {
return getAllArtifactsToBuild(
- OutputGroupProvider.get(target),
+ OutputGroupInfo.get(target),
target.getProvider(FileProvider.class),
context
);
@@ -179,13 +179,13 @@
AspectValue aspectValue, TopLevelArtifactContext context) {
ConfiguredAspect configuredAspect = aspectValue.getConfiguredAspect();
return getAllArtifactsToBuild(
- OutputGroupProvider.get(configuredAspect),
+ OutputGroupInfo.get(configuredAspect),
configuredAspect.getProvider(FileProvider.class),
context);
}
public static ArtifactsToBuild getAllArtifactsToBuild(
- @Nullable OutputGroupProvider outputGroupProvider,
+ @Nullable OutputGroupInfo outputGroupInfo,
@Nullable FileProvider fileProvider,
TopLevelArtifactContext context) {
NestedSetBuilder<ArtifactsInOutputGroup> allBuilder = NestedSetBuilder.stableOrder();
@@ -193,12 +193,12 @@
for (String outputGroup : context.outputGroups()) {
NestedSetBuilder<Artifact> results = NestedSetBuilder.stableOrder();
- if (outputGroup.equals(OutputGroupProvider.DEFAULT) && fileProvider != null) {
+ if (outputGroup.equals(OutputGroupInfo.DEFAULT) && fileProvider != null) {
results.addTransitive(fileProvider.getFilesToBuild());
}
- if (outputGroupProvider != null) {
- results.addTransitive(outputGroupProvider.getOutputGroup(outputGroup));
+ if (outputGroupInfo != null) {
+ results.addTransitive(outputGroupInfo.getOutputGroup(outputGroup));
}
// Ignore output groups that have no artifacts.
@@ -207,7 +207,7 @@
}
boolean isImportantGroup =
- !outputGroup.startsWith(OutputGroupProvider.HIDDEN_OUTPUT_GROUP_PREFIX);
+ !outputGroup.startsWith(OutputGroupInfo.HIDDEN_OUTPUT_GROUP_PREFIX);
ArtifactsInOutputGroup artifacts =
new ArtifactsInOutputGroup(outputGroup, isImportantGroup, results.build());
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/AbstractConfiguredTarget.java b/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/AbstractConfiguredTarget.java
index 5c9c463..ca2fc81 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/AbstractConfiguredTarget.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/AbstractConfiguredTarget.java
@@ -21,7 +21,7 @@
import com.google.devtools.build.lib.analysis.DefaultInfo;
import com.google.devtools.build.lib.analysis.FileProvider;
import com.google.devtools.build.lib.analysis.FilesToRunProvider;
-import com.google.devtools.build.lib.analysis.OutputGroupProvider;
+import com.google.devtools.build.lib.analysis.OutputGroupInfo;
import com.google.devtools.build.lib.analysis.RunfilesProvider;
import com.google.devtools.build.lib.analysis.TargetContext;
import com.google.devtools.build.lib.analysis.TransitiveInfoProvider;
@@ -165,8 +165,8 @@
LABEL_FIELD,
FILES_FIELD,
FilesToRunProvider.SKYLARK_NAME));
- if (get(OutputGroupProvider.SKYLARK_CONSTRUCTOR) != null) {
- result.add(OutputGroupProvider.SKYLARK_NAME);
+ if (get(OutputGroupInfo.SKYLARK_CONSTRUCTOR) != null) {
+ result.add(OutputGroupInfo.SKYLARK_NAME);
}
addExtraSkylarkKeys(result::add);
return result.build();
@@ -206,8 +206,8 @@
*/
@Override
public final Object get(String providerKey) {
- if (OutputGroupProvider.SKYLARK_NAME.equals(providerKey)) {
- return get(OutputGroupProvider.SKYLARK_CONSTRUCTOR);
+ if (OutputGroupInfo.SKYLARK_NAME.equals(providerKey)) {
+ return get(OutputGroupInfo.SKYLARK_CONSTRUCTOR);
}
switch (providerKey) {
case FILES_FIELD:
@@ -216,8 +216,8 @@
case FilesToRunProvider.SKYLARK_NAME:
// Standard fields should be proxied to their default provider object
return getDefaultProvider().getValue(providerKey);
- case OutputGroupProvider.SKYLARK_NAME:
- return get(OutputGroupProvider.SKYLARK_CONSTRUCTOR);
+ case OutputGroupInfo.SKYLARK_NAME:
+ return get(OutputGroupInfo.SKYLARK_CONSTRUCTOR);
default:
return rawGetSkylarkProvider(providerKey);
}
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/MergedConfiguredTarget.java b/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/MergedConfiguredTarget.java
index da8eb70..fba49e1 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/MergedConfiguredTarget.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/MergedConfiguredTarget.java
@@ -19,7 +19,7 @@
import com.google.devtools.build.lib.analysis.ConfiguredAspect;
import com.google.devtools.build.lib.analysis.ConfiguredTarget;
import com.google.devtools.build.lib.analysis.ExtraActionArtifactsProvider;
-import com.google.devtools.build.lib.analysis.OutputGroupProvider;
+import com.google.devtools.build.lib.analysis.OutputGroupInfo;
import com.google.devtools.build.lib.analysis.TransitiveInfoProvider;
import com.google.devtools.build.lib.analysis.TransitiveInfoProviderMap;
import com.google.devtools.build.lib.analysis.TransitiveInfoProviderMapBuilder;
@@ -110,16 +110,16 @@
}
// Merge output group providers.
- OutputGroupProvider mergedOutputGroupProvider =
- OutputGroupProvider.merge(getAllOutputGroupProviders(base, aspects));
+ OutputGroupInfo mergedOutputGroupInfo =
+ OutputGroupInfo.merge(getAllOutputGroupProviders(base, aspects));
// Merge extra-actions provider.
ExtraActionArtifactsProvider mergedExtraActionProviders = ExtraActionArtifactsProvider.merge(
getAllProviders(base, aspects, ExtraActionArtifactsProvider.class));
TransitiveInfoProviderMapBuilder aspectProviders = new TransitiveInfoProviderMapBuilder();
- if (mergedOutputGroupProvider != null) {
- aspectProviders.put(mergedOutputGroupProvider);
+ if (mergedOutputGroupInfo != null) {
+ aspectProviders.put(mergedOutputGroupInfo);
}
if (mergedExtraActionProviders != null) {
aspectProviders.add(mergedExtraActionProviders);
@@ -129,7 +129,7 @@
TransitiveInfoProviderMap providers = aspect.getProviders();
for (int i = 0; i < providers.getProviderCount(); ++i) {
Object providerKey = providers.getProviderKeyAt(i);
- if (OutputGroupProvider.SKYLARK_CONSTRUCTOR.getKey().equals(providerKey)
+ if (OutputGroupInfo.SKYLARK_CONSTRUCTOR.getKey().equals(providerKey)
|| ExtraActionArtifactsProvider.class.equals(providerKey)) {
continue;
}
@@ -162,16 +162,16 @@
return new MergedConfiguredTarget(base, aspectProviders.build());
}
- private static ImmutableList<OutputGroupProvider> getAllOutputGroupProviders(
+ private static ImmutableList<OutputGroupInfo> getAllOutputGroupProviders(
ConfiguredTarget base, Iterable<ConfiguredAspect> aspects) {
- OutputGroupProvider baseProvider = OutputGroupProvider.get(base);
- ImmutableList.Builder<OutputGroupProvider> providers = ImmutableList.builder();
+ OutputGroupInfo baseProvider = OutputGroupInfo.get(base);
+ ImmutableList.Builder<OutputGroupInfo> providers = ImmutableList.builder();
if (baseProvider != null) {
providers.add(baseProvider);
}
for (ConfiguredAspect configuredAspect : aspects) {
- OutputGroupProvider aspectProvider = OutputGroupProvider.get(configuredAspect);
+ OutputGroupInfo aspectProvider = OutputGroupInfo.get(configuredAspect);
if (aspectProvider == null) {
continue;
}
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleClassFunctions.java b/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleClassFunctions.java
index baee697..28c0313 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleClassFunctions.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleClassFunctions.java
@@ -38,7 +38,7 @@
import com.google.devtools.build.lib.analysis.ActionsProvider;
import com.google.devtools.build.lib.analysis.BaseRuleClasses;
import com.google.devtools.build.lib.analysis.DefaultInfo;
-import com.google.devtools.build.lib.analysis.OutputGroupProvider;
+import com.google.devtools.build.lib.analysis.OutputGroupInfo;
import com.google.devtools.build.lib.analysis.TransitiveInfoCollection;
import com.google.devtools.build.lib.analysis.skylark.SkylarkAttr.Descriptor;
import com.google.devtools.build.lib.analysis.test.TestConfiguration;
@@ -249,7 +249,7 @@
+ "OutputGroupInfo(group1 = <files>, group2 = <files>...)</pre>"
+ "See <a href=\"../rules.html#output-groups\">Output Groups</a> for more information"
)
- private static final Provider outputGroupInfo = OutputGroupProvider.SKYLARK_CONSTRUCTOR;
+ private static final Provider outputGroupInfo = OutputGroupInfo.SKYLARK_CONSTRUCTOR;
// TODO(bazel-team): Move to a "testing" namespace module. Normally we'd pass an objectType
// to @SkylarkSignature to do this, but that doesn't work here because we're exposing an already-
@@ -1233,7 +1233,7 @@
)
private static final BuiltinFunction output_group = new BuiltinFunction("output_group") {
public SkylarkNestedSet invoke(TransitiveInfoCollection self, String group) {
- OutputGroupProvider provider = OutputGroupProvider.get(self);
+ OutputGroupInfo provider = OutputGroupInfo.get(self);
NestedSet<Artifact> result = provider != null
? provider.getOutputGroup(group)
: NestedSetBuilder.<Artifact>emptySet(Order.STABLE_ORDER);
diff --git a/src/main/java/com/google/devtools/build/lib/buildtool/BuildRequest.java b/src/main/java/com/google/devtools/build/lib/buildtool/BuildRequest.java
index 6a489cc..ba6c75e 100644
--- a/src/main/java/com/google/devtools/build/lib/buildtool/BuildRequest.java
+++ b/src/main/java/com/google/devtools/build/lib/buildtool/BuildRequest.java
@@ -21,7 +21,7 @@
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSortedSet;
import com.google.devtools.build.lib.analysis.BuildView;
-import com.google.devtools.build.lib.analysis.OutputGroupProvider;
+import com.google.devtools.build.lib.analysis.OutputGroupInfo;
import com.google.devtools.build.lib.analysis.TopLevelArtifactContext;
import com.google.devtools.build.lib.analysis.config.InvalidConfigurationException;
import com.google.devtools.build.lib.exec.ExecutionOptions;
@@ -269,7 +269,7 @@
public TopLevelArtifactContext getTopLevelArtifactContext() {
return new TopLevelArtifactContext(
getOptions(ExecutionOptions.class).testStrategy.equals("exclusive"),
- OutputGroupProvider.determineOutputGroups(getBuildOptions().outputGroups));
+ OutputGroupInfo.determineOutputGroups(getBuildOptions().outputGroups));
}
public ImmutableSortedSet<String> getMultiCpus() {
diff --git a/src/main/java/com/google/devtools/build/lib/buildtool/BuildResultPrinter.java b/src/main/java/com/google/devtools/build/lib/buildtool/BuildResultPrinter.java
index 9abf8d7..e843780 100644
--- a/src/main/java/com/google/devtools/build/lib/buildtool/BuildResultPrinter.java
+++ b/src/main/java/com/google/devtools/build/lib/buildtool/BuildResultPrinter.java
@@ -18,7 +18,7 @@
import com.google.devtools.build.lib.actions.Artifact;
import com.google.devtools.build.lib.analysis.ConfiguredTarget;
import com.google.devtools.build.lib.analysis.FileProvider;
-import com.google.devtools.build.lib.analysis.OutputGroupProvider;
+import com.google.devtools.build.lib.analysis.OutputGroupInfo;
import com.google.devtools.build.lib.analysis.TopLevelArtifactContext;
import com.google.devtools.build.lib.analysis.TopLevelArtifactHelper;
import com.google.devtools.build.lib.analysis.TransitiveInfoCollection;
@@ -131,11 +131,11 @@
// For failed compilation, it is still useful to examine temp artifacts,
// (ie, preprocessed and assembler files).
- OutputGroupProvider topLevelProvider =
- OutputGroupProvider.get(target);
+ OutputGroupInfo topLevelProvider =
+ OutputGroupInfo.get(target);
String productName = env.getRuntime().getProductName();
if (topLevelProvider != null) {
- for (Artifact temp : topLevelProvider.getOutputGroup(OutputGroupProvider.TEMP_FILES)) {
+ for (Artifact temp : topLevelProvider.getOutputGroup(OutputGroupInfo.TEMP_FILES)) {
if (temp.getPath().exists()) {
outErr.printErrLn(" See temp at "
+ OutputDirectoryLinksUtils.getPrettyPath(temp.getPath(),
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java
index f2121c5..e39683e 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java
@@ -31,7 +31,7 @@
import com.google.devtools.build.lib.actions.ParameterFile;
import com.google.devtools.build.lib.analysis.ConfiguredTarget;
import com.google.devtools.build.lib.analysis.FilesToRunProvider;
-import com.google.devtools.build.lib.analysis.OutputGroupProvider;
+import com.google.devtools.build.lib.analysis.OutputGroupInfo;
import com.google.devtools.build.lib.analysis.RuleConfiguredTargetBuilder;
import com.google.devtools.build.lib.analysis.RuleConfiguredTargetFactory;
import com.google.devtools.build.lib.analysis.RuleContext;
@@ -580,7 +580,7 @@
}
if (oneVersionEnforcementArtifact != null) {
- builder.addOutputGroup(OutputGroupProvider.HIDDEN_TOP_LEVEL, oneVersionEnforcementArtifact);
+ builder.addOutputGroup(OutputGroupInfo.HIDDEN_TOP_LEVEL, oneVersionEnforcementArtifact);
}
if (mobileInstallResourceApks != null) {
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinaryMobileInstall.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinaryMobileInstall.java
index ef190b8..07678c9 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinaryMobileInstall.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinaryMobileInstall.java
@@ -14,7 +14,7 @@
package com.google.devtools.build.lib.rules.android;
-import static com.google.devtools.build.lib.analysis.OutputGroupProvider.INTERNAL_SUFFIX;
+import static com.google.devtools.build.lib.analysis.OutputGroupInfo.INTERNAL_SUFFIX;
import com.google.common.base.Function;
import com.google.common.base.Functions;
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java
index 83a03c9..537b431 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java
@@ -22,7 +22,7 @@
import com.google.devtools.build.lib.analysis.AnalysisUtils;
import com.google.devtools.build.lib.analysis.FileProvider;
import com.google.devtools.build.lib.analysis.FilesToRunProvider;
-import com.google.devtools.build.lib.analysis.OutputGroupProvider;
+import com.google.devtools.build.lib.analysis.OutputGroupInfo;
import com.google.devtools.build.lib.analysis.RuleConfiguredTargetBuilder;
import com.google.devtools.build.lib.analysis.RuleContext;
import com.google.devtools.build.lib.analysis.Runfiles;
@@ -832,7 +832,7 @@
nativeLibs))
.addSkylarkTransitiveInfo(AndroidSkylarkApiProvider.NAME, new AndroidSkylarkApiProvider())
.addOutputGroup(
- OutputGroupProvider.HIDDEN_TOP_LEVEL, collectHiddenTopLevelArtifacts(ruleContext))
+ OutputGroupInfo.HIDDEN_TOP_LEVEL, collectHiddenTopLevelArtifacts(ruleContext))
.addOutputGroup(
JavaSemantics.SOURCE_JARS_OUTPUT_GROUP, sourceJarsProvider.getTransitiveSourceJars());
}
@@ -964,10 +964,10 @@
private NestedSet<Artifact> collectHiddenTopLevelArtifacts(RuleContext ruleContext) {
NestedSetBuilder<Artifact> builder = NestedSetBuilder.stableOrder();
- for (OutputGroupProvider provider :
+ for (OutputGroupInfo provider :
getTransitivePrerequisites(
- ruleContext, Mode.TARGET, OutputGroupProvider.SKYLARK_CONSTRUCTOR)) {
- builder.addTransitive(provider.getOutputGroup(OutputGroupProvider.HIDDEN_TOP_LEVEL));
+ ruleContext, Mode.TARGET, OutputGroupInfo.SKYLARK_CONSTRUCTOR)) {
+ builder.addTransitive(provider.getOutputGroup(OutputGroupInfo.HIDDEN_TOP_LEVEL));
}
return builder.build();
}
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidIdlHelper.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidIdlHelper.java
index ede1889..977455f 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidIdlHelper.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidIdlHelper.java
@@ -17,7 +17,7 @@
import com.google.common.collect.ImmutableMap;
import com.google.devtools.build.lib.actions.Artifact;
import com.google.devtools.build.lib.actions.ParameterFile.ParameterFileType;
-import com.google.devtools.build.lib.analysis.OutputGroupProvider;
+import com.google.devtools.build.lib.analysis.OutputGroupInfo;
import com.google.devtools.build.lib.analysis.RuleConfiguredTargetBuilder;
import com.google.devtools.build.lib.analysis.RuleContext;
import com.google.devtools.build.lib.analysis.TransitiveInfoCollection;
@@ -53,7 +53,7 @@
* generated from annotation processors).
*/
static final String IDL_JARS_OUTPUT_GROUP =
- OutputGroupProvider.HIDDEN_OUTPUT_GROUP_PREFIX + "idl_jars";
+ OutputGroupInfo.HIDDEN_OUTPUT_GROUP_PREFIX + "idl_jars";
private final RuleContext ruleContext;
private final AndroidIdlProvider androidIdlProvider;
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibrary.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibrary.java
index 480b4a6..eeefadd 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibrary.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibrary.java
@@ -18,7 +18,7 @@
import com.google.common.collect.Iterables;
import com.google.devtools.build.lib.actions.Artifact;
import com.google.devtools.build.lib.analysis.ConfiguredTarget;
-import com.google.devtools.build.lib.analysis.OutputGroupProvider;
+import com.google.devtools.build.lib.analysis.OutputGroupInfo;
import com.google.devtools.build.lib.analysis.RuleConfiguredTargetBuilder;
import com.google.devtools.build.lib.analysis.RuleConfiguredTargetFactory;
import com.google.devtools.build.lib.analysis.RuleContext;
@@ -341,7 +341,7 @@
AndroidCcLinkParamsProvider.create(androidCommon.getCcLinkParamsStore()))
.add(JavaPluginInfoProvider.class, JavaCommon.getTransitivePlugins(ruleContext))
.add(ProguardSpecProvider.class, new ProguardSpecProvider(transitiveProguardConfigs))
- .addOutputGroup(OutputGroupProvider.HIDDEN_TOP_LEVEL, transitiveProguardConfigs)
+ .addOutputGroup(OutputGroupInfo.HIDDEN_TOP_LEVEL, transitiveProguardConfigs)
.add(
AndroidLibraryResourceClassJarProvider.class,
AndroidLibraryResourceClassJarProvider.create(transitiveResourcesJars.build()));
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLocalTestBase.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLocalTestBase.java
index 87fa145..391408a 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLocalTestBase.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLocalTestBase.java
@@ -20,7 +20,7 @@
import com.google.devtools.build.lib.actions.Artifact;
import com.google.devtools.build.lib.analysis.ConfiguredTarget;
import com.google.devtools.build.lib.analysis.FileProvider;
-import com.google.devtools.build.lib.analysis.OutputGroupProvider;
+import com.google.devtools.build.lib.analysis.OutputGroupInfo;
import com.google.devtools.build.lib.analysis.RuleConfiguredTargetBuilder;
import com.google.devtools.build.lib.analysis.RuleConfiguredTargetFactory;
import com.google.devtools.build.lib.analysis.RuleContext;
@@ -309,7 +309,7 @@
AndroidFeatureFlagSetProvider.getAndValidateFlagMapFromRuleContext(ruleContext);
if (oneVersionOutputArtifact != null) {
- builder.addOutputGroup(OutputGroupProvider.HIDDEN_TOP_LEVEL, oneVersionOutputArtifact);
+ builder.addOutputGroup(OutputGroupInfo.HIDDEN_TOP_LEVEL, oneVersionOutputArtifact);
}
NestedSet<Artifact> extraFilesToRun =
diff --git a/src/main/java/com/google/devtools/build/lib/rules/config/ConfigFeatureFlagProvider.java b/src/main/java/com/google/devtools/build/lib/rules/config/ConfigFeatureFlagProvider.java
index 80b122c..ff80048 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/config/ConfigFeatureFlagProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/config/ConfigFeatureFlagProvider.java
@@ -58,7 +58,7 @@
return new ConfigFeatureFlagProvider(value, isValidValue);
}
- /** A constructor callable from Skylark for OutputGroupProvider. */
+ /** A constructor callable from Skylark for OutputGroupInfo. */
private static class Constructor extends NativeProvider<ConfigFeatureFlagProvider> {
private Constructor() {
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcBinary.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcBinary.java
index 9cdcef6..246b21e 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcBinary.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcBinary.java
@@ -26,7 +26,7 @@
import com.google.devtools.build.lib.actions.ParameterFile.ParameterFileType;
import com.google.devtools.build.lib.analysis.ConfiguredTarget;
import com.google.devtools.build.lib.analysis.MakeVariableSupplier.MapBackedMakeVariableSupplier;
-import com.google.devtools.build.lib.analysis.OutputGroupProvider;
+import com.google.devtools.build.lib.analysis.OutputGroupInfo;
import com.google.devtools.build.lib.analysis.RuleConfiguredTargetBuilder;
import com.google.devtools.build.lib.analysis.RuleConfiguredTargetFactory;
import com.google.devtools.build.lib.analysis.RuleContext;
@@ -890,14 +890,14 @@
new CppDebugFileProvider(
dwoArtifacts.getDwoArtifacts(), dwoArtifacts.getPicDwoArtifacts()))
.addOutputGroup(
- OutputGroupProvider.TEMP_FILES, getTemps(cppConfiguration, ccCompilationOutputs))
- .addOutputGroup(OutputGroupProvider.FILES_TO_COMPILE, filesToCompile)
+ OutputGroupInfo.TEMP_FILES, getTemps(cppConfiguration, ccCompilationOutputs))
+ .addOutputGroup(OutputGroupInfo.FILES_TO_COMPILE, filesToCompile)
// For CcBinary targets, we only want to ensure that we process headers in dependencies and
// thus only add header tokens to HIDDEN_TOP_LEVEL. If we add all HIDDEN_TOP_LEVEL artifacts
// from dependent CcLibrary targets, we'd be building .pic.o files in nopic builds.
- .addOutputGroup(OutputGroupProvider.HIDDEN_TOP_LEVEL, headerTokens)
+ .addOutputGroup(OutputGroupInfo.HIDDEN_TOP_LEVEL, headerTokens)
.addOutputGroup(
- OutputGroupProvider.COMPILATION_PREREQUISITES,
+ OutputGroupInfo.COMPILATION_PREREQUISITES,
CcCommon.collectCompilationPrerequisites(ruleContext, cppCompilationContext));
CppHelper.maybeAddStaticLinkMarkerProvider(builder, ruleContext);
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibrary.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibrary.java
index 461ed4d..9777523 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibrary.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibrary.java
@@ -21,7 +21,7 @@
import com.google.devtools.build.lib.actions.FailAction;
import com.google.devtools.build.lib.analysis.ConfiguredTarget;
import com.google.devtools.build.lib.analysis.MakeVariableSupplier.MapBackedMakeVariableSupplier;
-import com.google.devtools.build.lib.analysis.OutputGroupProvider;
+import com.google.devtools.build.lib.analysis.OutputGroupInfo;
import com.google.devtools.build.lib.analysis.RuleConfiguredTargetBuilder;
import com.google.devtools.build.lib.analysis.RuleConfiguredTargetFactory;
import com.google.devtools.build.lib.analysis.RuleContext;
@@ -318,7 +318,7 @@
.addProvider(
CppRunfilesProvider.class, new CppRunfilesProvider(staticRunfiles, sharedRunfiles))
.addOutputGroup(
- OutputGroupProvider.HIDDEN_TOP_LEVEL,
+ OutputGroupInfo.HIDDEN_TOP_LEVEL,
collectHiddenTopLevelArtifacts(
ruleContext, ccToolchain, info.getCcCompilationOutputs()))
.addOutputGroup(
@@ -339,11 +339,11 @@
artifactsToForceBuilder.addTransitive(
ccCompilationOutputs.getFilesToCompile(
isLipoCollector, processHeadersInDependencies, usePic));
- for (OutputGroupProvider dep :
+ for (OutputGroupInfo dep :
ruleContext.getPrerequisites(
- "deps", Mode.TARGET, OutputGroupProvider.SKYLARK_CONSTRUCTOR)) {
+ "deps", Mode.TARGET, OutputGroupInfo.SKYLARK_CONSTRUCTOR)) {
artifactsToForceBuilder.addTransitive(
- dep.getOutputGroup(OutputGroupProvider.HIDDEN_TOP_LEVEL));
+ dep.getOutputGroup(OutputGroupInfo.HIDDEN_TOP_LEVEL));
}
return artifactsToForceBuilder.build();
}
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibraryHelper.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibraryHelper.java
index fbd1322b..d22b184 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibraryHelper.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibraryHelper.java
@@ -33,7 +33,7 @@
import com.google.devtools.build.lib.analysis.AnalysisUtils;
import com.google.devtools.build.lib.analysis.FileProvider;
import com.google.devtools.build.lib.analysis.LanguageDependentFragment;
-import com.google.devtools.build.lib.analysis.OutputGroupProvider;
+import com.google.devtools.build.lib.analysis.OutputGroupInfo;
import com.google.devtools.build.lib.analysis.RuleContext;
import com.google.devtools.build.lib.analysis.Runfiles;
import com.google.devtools.build.lib.analysis.RunfilesProvider;
@@ -81,12 +81,12 @@
*/
public final class CcLibraryHelper {
/**
- * Similar to {@code OutputGroupProvider.HIDDEN_TOP_LEVEL}, but specific to header token files.
+ * Similar to {@code OutputGroupInfo.HIDDEN_TOP_LEVEL}, but specific to header token files.
*/
public static final String HIDDEN_HEADER_TOKENS =
- OutputGroupProvider.HIDDEN_OUTPUT_GROUP_PREFIX
+ OutputGroupInfo.HIDDEN_OUTPUT_GROUP_PREFIX
+ "hidden_header_tokens"
- + OutputGroupProvider.INTERNAL_SUFFIX;
+ + OutputGroupInfo.INTERNAL_SUFFIX;
/** A string constant for the name of archive library(.a, .lo) output group. */
public static final String ARCHIVE_LIBRARY_OUTPUT_GROUP_NAME = "archive";
@@ -1072,16 +1072,16 @@
addLinkerOutputArtifacts(outputGroups, ccOutputs);
}
- outputGroups.put(OutputGroupProvider.TEMP_FILES, getTemps(ccOutputs));
+ outputGroups.put(OutputGroupInfo.TEMP_FILES, getTemps(ccOutputs));
CppConfiguration cppConfiguration = ruleContext.getFragment(CppConfiguration.class);
if (emitCompileProviders) {
boolean isLipoCollector = cppConfiguration.isLipoContextCollector();
boolean processHeadersInDependencies = cppConfiguration.processHeadersInDependencies();
boolean usePic = CppHelper.usePic(ruleContext, ccToolchain, false);
outputGroups.put(
- OutputGroupProvider.FILES_TO_COMPILE,
+ OutputGroupInfo.FILES_TO_COMPILE,
ccOutputs.getFilesToCompile(isLipoCollector, processHeadersInDependencies, usePic));
- outputGroups.put(OutputGroupProvider.COMPILATION_PREREQUISITES,
+ outputGroups.put(OutputGroupInfo.COMPILATION_PREREQUISITES,
CcCommon.collectCompilationPrerequisites(ruleContext, cppCompilationContext));
}
@@ -1516,9 +1516,9 @@
static NestedSet<Artifact> collectHeaderTokens(
RuleContext ruleContext, CcCompilationOutputs ccCompilationOutputs) {
NestedSetBuilder<Artifact> headerTokens = NestedSetBuilder.stableOrder();
- for (OutputGroupProvider dep :
+ for (OutputGroupInfo dep :
ruleContext.getPrerequisites(
- "deps", Mode.TARGET, OutputGroupProvider.SKYLARK_CONSTRUCTOR)) {
+ "deps", Mode.TARGET, OutputGroupInfo.SKYLARK_CONSTRUCTOR)) {
headerTokens.addTransitive(dep.getOutputGroup(CcLibraryHelper.HIDDEN_HEADER_TOKENS));
}
if (ruleContext.getFragment(CppConfiguration.class).processHeadersInDependencies()) {
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/proto/CcProtoAspect.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/proto/CcProtoAspect.java
index eed3c55..8cb5fe7 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/proto/CcProtoAspect.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/proto/CcProtoAspect.java
@@ -26,7 +26,7 @@
import com.google.devtools.build.lib.analysis.ConfiguredAspect;
import com.google.devtools.build.lib.analysis.ConfiguredAspectFactory;
import com.google.devtools.build.lib.analysis.ConfiguredTarget;
-import com.google.devtools.build.lib.analysis.OutputGroupProvider;
+import com.google.devtools.build.lib.analysis.OutputGroupInfo;
import com.google.devtools.build.lib.analysis.RuleContext;
import com.google.devtools.build.lib.analysis.TransitiveInfoCollection;
import com.google.devtools.build.lib.analysis.TransitiveInfoProvider;
@@ -317,12 +317,12 @@
}
public void addProviders(ConfiguredAspect.Builder builder) {
- OutputGroupProvider outputGroupProvider = new OutputGroupProvider(outputGroups);
+ OutputGroupInfo outputGroupInfo = new OutputGroupInfo(outputGroups);
builder.addProvider(
new CcProtoLibraryProviders(
- filesBuilder.build(), ccLibraryProviders, outputGroupProvider));
+ filesBuilder.build(), ccLibraryProviders, outputGroupInfo));
builder.addProviders(ccLibraryProviders);
- builder.addNativeDeclaredProvider(outputGroupProvider);
+ builder.addNativeDeclaredProvider(outputGroupInfo);
if (headerProvider != null) {
builder.addProvider(headerProvider);
}
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/proto/CcProtoLibrary.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/proto/CcProtoLibrary.java
index 06ab5b68..da5d46b 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/proto/CcProtoLibrary.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/proto/CcProtoLibrary.java
@@ -51,9 +51,9 @@
.addProvider(
RunfilesProvider.class, RunfilesProvider.withData(Runfiles.EMPTY, Runfiles.EMPTY))
.addProviders(depProviders.providerMap);
- for (String groupName : depProviders.outputGroupProvider) {
+ for (String groupName : depProviders.outputGroupInfo) {
ruleConfiguredTargetBuilder.addOutputGroup(groupName,
- depProviders.outputGroupProvider.getOutputGroup(groupName));
+ depProviders.outputGroupInfo.getOutputGroup(groupName));
}
return ruleConfiguredTargetBuilder
.addSkylarkTransitiveInfo(CcSkylarkApiProvider.NAME, new CcSkylarkApiProvider())
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/proto/CcProtoLibraryProviders.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/proto/CcProtoLibraryProviders.java
index f9bb826..b4ae002 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/proto/CcProtoLibraryProviders.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/proto/CcProtoLibraryProviders.java
@@ -15,7 +15,7 @@
package com.google.devtools.build.lib.rules.cpp.proto;
import com.google.devtools.build.lib.actions.Artifact;
-import com.google.devtools.build.lib.analysis.OutputGroupProvider;
+import com.google.devtools.build.lib.analysis.OutputGroupInfo;
import com.google.devtools.build.lib.analysis.TransitiveInfoProvider;
import com.google.devtools.build.lib.analysis.TransitiveInfoProviderMap;
import com.google.devtools.build.lib.collect.nestedset.NestedSet;
@@ -29,13 +29,13 @@
final class CcProtoLibraryProviders implements TransitiveInfoProvider {
final NestedSet<Artifact> filesBuilder;
final TransitiveInfoProviderMap providerMap;
- final OutputGroupProvider outputGroupProvider;
+ final OutputGroupInfo outputGroupInfo;
CcProtoLibraryProviders(NestedSet<Artifact> filesBuilder,
TransitiveInfoProviderMap providerMap,
- OutputGroupProvider outputGroupProvider) {
+ OutputGroupInfo outputGroupInfo) {
this.filesBuilder = filesBuilder;
this.providerMap = providerMap;
- this.outputGroupProvider = outputGroupProvider;
+ this.outputGroupInfo = outputGroupInfo;
}
}
diff --git a/src/main/java/com/google/devtools/build/lib/rules/filegroup/Filegroup.java b/src/main/java/com/google/devtools/build/lib/rules/filegroup/Filegroup.java
index b3fce5d..e8b3309 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/filegroup/Filegroup.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/filegroup/Filegroup.java
@@ -14,14 +14,14 @@
package com.google.devtools.build.lib.rules.filegroup;
-import static com.google.devtools.build.lib.analysis.OutputGroupProvider.INTERNAL_SUFFIX;
+import static com.google.devtools.build.lib.analysis.OutputGroupInfo.INTERNAL_SUFFIX;
import com.google.devtools.build.lib.actions.Actions;
import com.google.devtools.build.lib.actions.Artifact;
import com.google.devtools.build.lib.analysis.CompilationHelper;
import com.google.devtools.build.lib.analysis.ConfiguredTarget;
import com.google.devtools.build.lib.analysis.MiddlemanProvider;
-import com.google.devtools.build.lib.analysis.OutputGroupProvider;
+import com.google.devtools.build.lib.analysis.OutputGroupInfo;
import com.google.devtools.build.lib.analysis.PrerequisiteArtifacts;
import com.google.devtools.build.lib.analysis.RuleConfiguredTargetBuilder;
import com.google.devtools.build.lib.analysis.RuleConfiguredTargetFactory;
@@ -128,9 +128,9 @@
NestedSetBuilder<Artifact> result = NestedSetBuilder.stableOrder();
for (TransitiveInfoCollection dep : deps) {
- OutputGroupProvider outputGroupProvider = OutputGroupProvider.get(dep);
- if (outputGroupProvider != null) {
- result.addTransitive(outputGroupProvider.getOutputGroup(outputGroupName));
+ OutputGroupInfo outputGroupInfo = OutputGroupInfo.get(dep);
+ if (outputGroupInfo != null) {
+ result.addTransitive(outputGroupInfo.getOutputGroup(outputGroupName));
}
}
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaBinary.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaBinary.java
index 6982f2f..9af940b 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaBinary.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaBinary.java
@@ -24,7 +24,7 @@
import com.google.devtools.build.lib.actions.Artifact;
import com.google.devtools.build.lib.analysis.ConfiguredTarget;
import com.google.devtools.build.lib.analysis.FilesToRunProvider;
-import com.google.devtools.build.lib.analysis.OutputGroupProvider;
+import com.google.devtools.build.lib.analysis.OutputGroupInfo;
import com.google.devtools.build.lib.analysis.RuleConfiguredTargetBuilder;
import com.google.devtools.build.lib.analysis.RuleConfiguredTargetFactory;
import com.google.devtools.build.lib.analysis.RuleContext;
@@ -313,7 +313,7 @@
// of safety.)
if (javaConfig.enforceOneVersionOnJavaTests() || !isJavaTestRule(ruleContext)) {
builder.addOutputGroup(
- OutputGroupProvider.HIDDEN_TOP_LEVEL,
+ OutputGroupInfo.HIDDEN_TOP_LEVEL,
OneVersionCheckActionBuilder.newBuilder()
.withEnforcementLevel(javaConfig.oneVersionEnforcementLevel())
.outputArtifact(
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaCommon.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaCommon.java
index 7dfcc4b..3549ecf 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaCommon.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaCommon.java
@@ -26,7 +26,7 @@
import com.google.devtools.build.lib.actions.Artifact;
import com.google.devtools.build.lib.analysis.AnalysisEnvironment;
import com.google.devtools.build.lib.analysis.AnalysisUtils;
-import com.google.devtools.build.lib.analysis.OutputGroupProvider;
+import com.google.devtools.build.lib.analysis.OutputGroupInfo;
import com.google.devtools.build.lib.analysis.PrerequisiteArtifacts;
import com.google.devtools.build.lib.analysis.RuleConfiguredTargetBuilder;
import com.google.devtools.build.lib.analysis.RuleContext;
@@ -724,7 +724,7 @@
InstrumentedFilesProvider.class,
getInstrumentationFilesProvider(ruleContext, filesToBuild, instrumentationSpec))
.add(JavaExportsProvider.class, exportsProvider)
- .addOutputGroup(OutputGroupProvider.FILES_TO_COMPILE, getFilesToCompile(classJar))
+ .addOutputGroup(OutputGroupInfo.FILES_TO_COMPILE, getFilesToCompile(classJar))
.add(JavaCompilationInfoProvider.class, compilationInfoProvider);
javaInfoBuilder.addProvider(JavaExportsProvider.class, exportsProvider);
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaImport.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaImport.java
index d3359e8..b31c79e 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaImport.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaImport.java
@@ -20,7 +20,7 @@
import com.google.devtools.build.lib.actions.Artifact;
import com.google.devtools.build.lib.analysis.ConfiguredTarget;
import com.google.devtools.build.lib.analysis.FileProvider;
-import com.google.devtools.build.lib.analysis.OutputGroupProvider;
+import com.google.devtools.build.lib.analysis.OutputGroupInfo;
import com.google.devtools.build.lib.analysis.RuleConfiguredTargetBuilder;
import com.google.devtools.build.lib.analysis.RuleConfiguredTargetFactory;
import com.google.devtools.build.lib.analysis.RuleContext;
@@ -188,7 +188,7 @@
.add(JavaSourceInfoProvider.class, javaSourceInfoProvider)
.add(ProguardSpecProvider.class, new ProguardSpecProvider(proguardSpecs))
.addOutputGroup(JavaSemantics.SOURCE_JARS_OUTPUT_GROUP, transitiveJavaSourceJars)
- .addOutputGroup(OutputGroupProvider.HIDDEN_TOP_LEVEL, proguardSpecs)
+ .addOutputGroup(OutputGroupInfo.HIDDEN_TOP_LEVEL, proguardSpecs)
.build();
}
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaLibrary.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaLibrary.java
index df75390..2c8ea6d 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaLibrary.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaLibrary.java
@@ -17,7 +17,7 @@
import com.google.common.collect.ImmutableMap;
import com.google.devtools.build.lib.actions.Artifact;
import com.google.devtools.build.lib.analysis.ConfiguredTarget;
-import com.google.devtools.build.lib.analysis.OutputGroupProvider;
+import com.google.devtools.build.lib.analysis.OutputGroupInfo;
import com.google.devtools.build.lib.analysis.RuleConfiguredTargetBuilder;
import com.google.devtools.build.lib.analysis.RuleConfiguredTargetFactory;
import com.google.devtools.build.lib.analysis.RuleContext;
@@ -249,7 +249,7 @@
.addProvider(new ProguardSpecProvider(proguardSpecs))
.addNativeDeclaredProvider(javaInfo)
.addOutputGroup(JavaSemantics.SOURCE_JARS_OUTPUT_GROUP, transitiveSourceJars)
- .addOutputGroup(OutputGroupProvider.HIDDEN_TOP_LEVEL, proguardSpecs);
+ .addOutputGroup(OutputGroupInfo.HIDDEN_TOP_LEVEL, proguardSpecs);
if (ruleContext.hasErrors()) {
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaSemantics.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaSemantics.java
index ebadc15..b7e59b5 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaSemantics.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaSemantics.java
@@ -24,7 +24,7 @@
import com.google.common.collect.Streams;
import com.google.devtools.build.lib.actions.Artifact;
import com.google.devtools.build.lib.analysis.LanguageDependentFragment.LibraryLanguage;
-import com.google.devtools.build.lib.analysis.OutputGroupProvider;
+import com.google.devtools.build.lib.analysis.OutputGroupInfo;
import com.google.devtools.build.lib.analysis.RuleConfiguredTargetBuilder;
import com.google.devtools.build.lib.analysis.RuleContext;
import com.google.devtools.build.lib.analysis.RuleDefinitionEnvironment;
@@ -127,14 +127,14 @@
* Name of the output group used for source jars.
*/
String SOURCE_JARS_OUTPUT_GROUP =
- OutputGroupProvider.HIDDEN_OUTPUT_GROUP_PREFIX + "source_jars";
+ OutputGroupInfo.HIDDEN_OUTPUT_GROUP_PREFIX + "source_jars";
/**
* Name of the output group used for gen jars (the jars containing the class files for sources
* generated from annotation processors).
*/
String GENERATED_JARS_OUTPUT_GROUP =
- OutputGroupProvider.HIDDEN_OUTPUT_GROUP_PREFIX + "gen_jars";
+ OutputGroupInfo.HIDDEN_OUTPUT_GROUP_PREFIX + "gen_jars";
/** Implementation for the :jvm attribute. */
static LateBoundDefault<?, Label> jvmAttribute(RuleDefinitionEnvironment env) {
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaLiteProtoLibrary.java b/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaLiteProtoLibrary.java
index 5595e3e..4b27b73 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaLiteProtoLibrary.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaLiteProtoLibrary.java
@@ -25,7 +25,7 @@
import com.google.common.collect.ImmutableMultimap;
import com.google.devtools.build.lib.actions.Artifact;
import com.google.devtools.build.lib.analysis.ConfiguredTarget;
-import com.google.devtools.build.lib.analysis.OutputGroupProvider;
+import com.google.devtools.build.lib.analysis.OutputGroupInfo;
import com.google.devtools.build.lib.analysis.RuleConfiguredTargetBuilder;
import com.google.devtools.build.lib.analysis.RuleConfiguredTargetFactory;
import com.google.devtools.build.lib.analysis.RuleContext;
@@ -103,7 +103,7 @@
JavaSkylarkApiProvider.NAME, JavaSkylarkApiProvider.fromRuleContext())
.addProvider(RunfilesProvider.withData(Runfiles.EMPTY, runfiles))
.addOutputGroup(
- OutputGroupProvider.DEFAULT, NestedSetBuilder.<Artifact>emptySet(STABLE_ORDER))
+ OutputGroupInfo.DEFAULT, NestedSetBuilder.<Artifact>emptySet(STABLE_ORDER))
.addProvider(getJavaLiteRuntimeSpec(ruleContext))
.addNativeDeclaredProvider(javaInfo)
.addProvider(createCcLinkParamsStore(ruleContext, ImmutableList.of()))
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaProtoLibrary.java b/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaProtoLibrary.java
index 79062a7..243251b 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaProtoLibrary.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaProtoLibrary.java
@@ -22,7 +22,7 @@
import com.google.common.collect.ImmutableList;
import com.google.devtools.build.lib.actions.Artifact;
import com.google.devtools.build.lib.analysis.ConfiguredTarget;
-import com.google.devtools.build.lib.analysis.OutputGroupProvider;
+import com.google.devtools.build.lib.analysis.OutputGroupInfo;
import com.google.devtools.build.lib.analysis.RuleConfiguredTargetBuilder;
import com.google.devtools.build.lib.analysis.RuleConfiguredTargetFactory;
import com.google.devtools.build.lib.analysis.RuleContext;
@@ -96,7 +96,7 @@
JavaSkylarkApiProvider.NAME, JavaSkylarkApiProvider.fromRuleContext())
.addProvider(RunfilesProvider.withData(Runfiles.EMPTY, runfiles))
.addOutputGroup(
- OutputGroupProvider.DEFAULT, NestedSetBuilder.<Artifact>emptySet(STABLE_ORDER))
+ OutputGroupInfo.DEFAULT, NestedSetBuilder.<Artifact>emptySet(STABLE_ORDER))
.addNativeDeclaredProvider(javaInfo);
if (ruleContext.getFragment(JavaConfiguration.class).jplPropagateCcLinkParamsStore()) {
diff --git a/src/main/java/com/google/devtools/build/lib/rules/python/PyCommon.java b/src/main/java/com/google/devtools/build/lib/rules/python/PyCommon.java
index d8da9b8..3a8c068 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/python/PyCommon.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/python/PyCommon.java
@@ -26,7 +26,7 @@
import com.google.devtools.build.lib.analysis.AnalysisEnvironment;
import com.google.devtools.build.lib.analysis.FileProvider;
import com.google.devtools.build.lib.analysis.LanguageDependentFragment;
-import com.google.devtools.build.lib.analysis.OutputGroupProvider;
+import com.google.devtools.build.lib.analysis.OutputGroupInfo;
import com.google.devtools.build.lib.analysis.PseudoAction;
import com.google.devtools.build.lib.analysis.RuleConfiguredTargetBuilder;
import com.google.devtools.build.lib.analysis.RuleContext;
@@ -169,8 +169,8 @@
createSourceProvider(this.transitivePythonSources, usesSharedLibraries()))
// Python targets are not really compilable. The best we can do is make sure that all
// generated source files are ready.
- .addOutputGroup(OutputGroupProvider.FILES_TO_COMPILE, transitivePythonSources)
- .addOutputGroup(OutputGroupProvider.COMPILATION_PREREQUISITES, transitivePythonSources);
+ .addOutputGroup(OutputGroupInfo.FILES_TO_COMPILE, transitivePythonSources)
+ .addOutputGroup(OutputGroupInfo.COMPILATION_PREREQUISITES, transitivePythonSources);
}
/**
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/commands/PrintActionCommand.java b/src/main/java/com/google/devtools/build/lib/runtime/commands/PrintActionCommand.java
index 465f29e..608a934 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/commands/PrintActionCommand.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/commands/PrintActionCommand.java
@@ -27,7 +27,7 @@
import com.google.devtools.build.lib.analysis.BuildView;
import com.google.devtools.build.lib.analysis.ConfiguredTarget;
import com.google.devtools.build.lib.analysis.FileProvider;
-import com.google.devtools.build.lib.analysis.OutputGroupProvider;
+import com.google.devtools.build.lib.analysis.OutputGroupInfo;
import com.google.devtools.build.lib.analysis.PrintActionVisitor;
import com.google.devtools.build.lib.analysis.configuredtargets.RuleConfiguredTarget;
import com.google.devtools.build.lib.buildtool.BuildRequest;
@@ -172,10 +172,10 @@
for (ConfiguredTarget configuredTarget : result.getActualTargets()) {
NestedSet<Artifact> filesToCompile = NestedSetBuilder.emptySet(Order.STABLE_ORDER);
- OutputGroupProvider outputGroupProvider = OutputGroupProvider.get(configuredTarget);
- if (outputGroupProvider != null) {
+ OutputGroupInfo outputGroupInfo = OutputGroupInfo.get(configuredTarget);
+ if (outputGroupInfo != null) {
filesToCompile =
- outputGroupProvider.getOutputGroup(OutputGroupProvider.FILES_TO_COMPILE);
+ outputGroupInfo.getOutputGroup(OutputGroupInfo.FILES_TO_COMPILE);
}
if (!filesToCompile.isEmpty()) {
try {
@@ -255,8 +255,8 @@
ActionGraph actionGraph,
ActionKeyContext actionKeyContext)
throws CommandLineExpansionException {
- NestedSet<Artifact> artifacts = OutputGroupProvider.get(configuredTarget)
- .getOutputGroup(OutputGroupProvider.FILES_TO_COMPILE);
+ NestedSet<Artifact> artifacts = OutputGroupInfo.get(configuredTarget)
+ .getOutputGroup(OutputGroupInfo.FILES_TO_COMPILE);
if (artifacts.isEmpty()) {
return;
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/mobileinstall/MobileInstallCommand.java b/src/main/java/com/google/devtools/build/lib/runtime/mobileinstall/MobileInstallCommand.java
index 259ee9f..0f297c2 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/mobileinstall/MobileInstallCommand.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/mobileinstall/MobileInstallCommand.java
@@ -14,7 +14,7 @@
package com.google.devtools.build.lib.runtime.mobileinstall;
-import static com.google.devtools.build.lib.analysis.OutputGroupProvider.INTERNAL_SUFFIX;
+import static com.google.devtools.build.lib.analysis.OutputGroupInfo.INTERNAL_SUFFIX;
import com.google.common.base.Strings;
import com.google.common.collect.ImmutableList;
