diff options
author | dslomov <dslomov@google.com> | 2017-12-14 11:15:43 -0500 |
---|---|---|
committer | John Cater <jcater@google.com> | 2017-12-14 12:38:38 -0500 |
commit | 69c45f8e37e021c6668b8be12eb44ad132292186 (patch) | |
tree | ce7fc74e0fc5622151d1776db649cba562f54584 /src/main/java/com/google/devtools/build/lib/analysis/RuleConfiguredTargetBuilder.java | |
parent | e45308610cd5764c8b34fd69dcb080df7b7a06ca (diff) |
Rename OutputGroupProvider -> OutputGroupInfo.
RELNOTES: None
PiperOrigin-RevId: 179046403
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/analysis/RuleConfiguredTargetBuilder.java')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/analysis/RuleConfiguredTargetBuilder.java | 18 |
1 files changed, 9 insertions, 9 deletions
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 38dd03a112..8f53a9b27b 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 @@ public final class RuleConfiguredTargetBuilder { 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 @@ public final class RuleConfiguredTargetBuilder { // 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 @@ public final class RuleConfiguredTargetBuilder { 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 @@ public final class RuleConfiguredTargetBuilder { * 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 @@ public final class RuleConfiguredTargetBuilder { 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); |