diff options
author | lberki <lberki@google.com> | 2018-04-09 03:16:19 -0700 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2018-04-09 03:17:36 -0700 |
commit | 406199f6d2f8f12af0d8338877a901bbc8293bce (patch) | |
tree | 28a5db5ac26d5b1039f13b9e1c643e6184ebc66b /src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfiguration.java | |
parent | f3de7d5ff2834ad601975929aa189cfe268a6fb9 (diff) |
Remove BuildConfiguration.Fragment#getReservedActionMnemonics() in favor of encoding the same in ConfiguredRuleClassProvider.
This is a step towards dumbing down BuildConfiguration.Fragment and the ConfigurationFactoryLoader, which is in needed so that we can rewrite C++/Java/Python rules in Skylark without having to introduce the concept of "configuration loader" in Skylark, too.
RELNOTES: None.
PiperOrigin-RevId: 192104912
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfiguration.java')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfiguration.java | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfiguration.java b/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfiguration.java index a068e51b72..4646a73565 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfiguration.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfiguration.java @@ -209,11 +209,6 @@ public class BuildConfiguration { public PatchTransition topLevelConfigurationHook(Target toTarget) { return null; } - - /** Returns a reserved set of action mnemonics. These cannot be used from a Skylark action. */ - public ImmutableSet<String> getReservedActionMnemonics() { - return ImmutableSet.of(); - } } public static final Label convertOptionsLabel(String input) throws OptionsParsingException { @@ -1273,6 +1268,7 @@ public class BuildConfiguration { Map<Class<? extends Fragment>, Fragment> fragmentsMap, BuildOptions buildOptions, BuildOptions.OptionsDiffForReconstruction buildOptionsDiff, + ImmutableSet<String> reservedActionMnemonics, String repositoryName) { this.directories = directories; this.fragments = makeFragmentsMap(fragmentsMap); @@ -1347,11 +1343,7 @@ public class BuildConfiguration { checksum = buildOptions.computeChecksum(); hashCode = computeHashCode(); - ImmutableSet.Builder<String> reservedActionMnemonics = ImmutableSet.builder(); - for (Fragment fragment : fragments.values()) { - reservedActionMnemonics.addAll(fragment.getReservedActionMnemonics()); - } - this.reservedActionMnemonics = reservedActionMnemonics.build(); + this.reservedActionMnemonics = reservedActionMnemonics; this.buildEventSupplier = Suppliers.memoize(this::createBuildEvent); } @@ -1378,6 +1370,7 @@ public class BuildConfiguration { fragmentsMap, options, BuildOptions.diffForReconstruction(defaultBuildOptions, options), + reservedActionMnemonics, mainRepositoryName.strippedName()); return newConfig; } @@ -1960,10 +1953,6 @@ public class BuildConfiguration { return skylarkVisibleFragments.keySet(); } - public ImmutableSet<String> getReservedActionMnemonics() { - return reservedActionMnemonics; - } - /** * Returns an extra transition that should apply to top-level targets in this * configuration. Returns null if no transition is needed. @@ -2007,4 +1996,8 @@ public class BuildConfiguration { .build()); return new BuildConfigurationEvent(eventId, builder.build()); } + + public ImmutableSet<String> getReservedActionMnemonics() { + return reservedActionMnemonics; + } } |