diff options
author | 2015-03-18 12:17:22 +0000 | |
---|---|---|
committer | 2015-03-18 13:48:46 +0000 | |
commit | c1d9450b388eff2180ba262340eaab048e0d626f (patch) | |
tree | 9808fb76cac4967547647a65259e2ddc06d808b2 /src/main/java/com | |
parent | 534a3c8c73aa02794f53b78759ba72663787988e (diff) |
add OutputGroupProvider.DEFAULT_GROUPS for commonly built groups
unit tests and main code have fallen out of sync a few times, so
consolidating the defaults here to make mistakes harder later on.
one could argue this also gives a little better mental locality.
--
MOS_MIGRATED_REVID=88921641
Diffstat (limited to 'src/main/java/com')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/analysis/OutputGroupProvider.java | 7 | ||||
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/buildtool/BuildRequest.java | 5 |
2 files changed, 8 insertions, 4 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/OutputGroupProvider.java b/src/main/java/com/google/devtools/build/lib/analysis/OutputGroupProvider.java index a0c4f78b61..90b373f0d0 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/OutputGroupProvider.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/OutputGroupProvider.java @@ -15,6 +15,7 @@ package com.google.devtools.build.lib.analysis; import com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableSet; import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.collect.nestedset.NestedSet; import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder; @@ -84,6 +85,12 @@ public final class OutputGroupProvider implements TransitiveInfoProvider { */ public static final String DEFAULT = "default"; + /** + * The default set of OutputGroups we typically want to build. + */ + public static final ImmutableSet<String> DEFAULT_GROUPS = + ImmutableSet.of(DEFAULT, TEMP_FILES, HIDDEN_TOP_LEVEL); + private final ImmutableMap<String, NestedSet<Artifact>> outputGroups; OutputGroupProvider(ImmutableMap<String, NestedSet<Artifact>> outputGroups) { 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 d47d1e5589..6d02666f14 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 @@ -502,10 +502,7 @@ public class BuildRequest implements OptionsClassProvider { } private ImmutableSortedSet<String> determineOutputGroups() { - Set<String> current = new HashSet<>(); - current.add(OutputGroupProvider.TEMP_FILES); - current.add(OutputGroupProvider.HIDDEN_TOP_LEVEL); - current.add(OutputGroupProvider.DEFAULT); + Set<String> current = new HashSet<>(OutputGroupProvider.DEFAULT_GROUPS); for (String outputGroup : getBuildOptions().outputGroups) { if (outputGroup.startsWith("-")) { |