aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google/devtools/build/lib/analysis
diff options
context:
space:
mode:
authorGravatar Eric Fellheimer <felly@google.com>2015-04-09 19:48:37 +0000
committerGravatar Ulf Adams <ulfjack@google.com>2015-04-10 08:02:17 +0000
commit9b43c60e9a82d5435a0bb9807c15d701500d739b (patch)
tree68b4a9b375d4b1fd6a6969442daf4722ac870f66 /src/main/java/com/google/devtools/build/lib/analysis
parent8c6b3bb7bfbe2b4822a3428540a638f8073fda2f (diff)
Minor cleanups in TopLevelArtifactHelper.
-- MOS_MIGRATED_REVID=90737433
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/analysis')
-rw-r--r--src/main/java/com/google/devtools/build/lib/analysis/TopLevelArtifactHelper.java12
1 files changed, 5 insertions, 7 deletions
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 39c04a403e..ddf3646d9a 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
@@ -83,7 +83,7 @@ public final class TopLevelArtifactHelper {
/**
* Utility function to form a NestedSet of all top-level Artifacts of the given targets.
*/
- public static ArtifactsToBuild getAllArtifactsToBuild(
+ public static ArtifactsToBuild getAllArtifactsToBuild(
Iterable<? extends TransitiveInfoCollection> targets, TopLevelArtifactContext context) {
NestedSetBuilder<Artifact> allArtifacts = NestedSetBuilder.stableOrder();
NestedSetBuilder<Artifact> importantArtifacts = NestedSetBuilder.stableOrder();
@@ -127,12 +127,10 @@ public final class TopLevelArtifactHelper {
results.addTransitive(outputGroupProvider.getOutputGroup(outputGroup));
}
- if (results != null) {
- if (outputGroup.startsWith(OutputGroupProvider.HIDDEN_OUTPUT_GROUP_PREFIX)) {
- allBuilder.addTransitive(results.build());
- } else {
- importantBuilder.addTransitive(results.build());
- }
+ if (outputGroup.startsWith(OutputGroupProvider.HIDDEN_OUTPUT_GROUP_PREFIX)) {
+ allBuilder.addTransitive(results.build());
+ } else {
+ importantBuilder.addTransitive(results.build());
}
}