commit 4c684398996e54f0d860292dd355d00d7dc97474
author Brett Wilson <brettw@chromium.org> Thu Sep 17 16:22:34 2020 -0700
committer Commit Bot <commit-bot@chromium.org> Tue Sep 29 18:49:02 2020 +0000
tree c434cf82898a7d63336759854969bbad2be44323
parent 99f72f881a3acdadb1572eaee8467b7f17b3338a

Fix "gn outputs" for bundle data.

Previously some conditions on the target type were duplicated.

Change-Id: I0cf34fd019ef32a68b43b60fc774f13bb46630b9
Reviewed-on: https://gn-review.googlesource.com/c/gn/+/10040
Reviewed-by: Sylvain Defresne <sdefresne@chromium.org>
Commit-Queue: Brett Wilson <brettw@chromium.org>

src/gn/target.cc

diff --git a/src/gn/target.cc b/src/gn/target.cc
index a5493e8..a0e6629 100644
--- a/src/gn/target.cc
+++ b/src/gn/target.cc
@@ -518,8 +518,7 @@
       output_type() == Target::ACTION_FOREACH ||
       output_type() == Target::GENERATED_FILE) {
     action_values().GetOutputsAsSourceFiles(this, outputs);
-  } else if (output_type() == Target::CREATE_BUNDLE ||
-             output_type() == Target::GENERATED_FILE) {
+  } else if (output_type() == Target::CREATE_BUNDLE) {
     if (!bundle_data().GetOutputsAsSourceFiles(settings(), this, outputs, err))
       return false;
   } else if (IsBinary() && output_type() != Target::SOURCE_SET) {
@@ -543,9 +542,9 @@
           output_file.AsSourceFile(settings()->build_settings()));
     }
   } else {
-    // Everything else (like a group or something) has a stamp or phony output.
-    // The dependency output file should have computed what this is. This won't
-    // be valid unless the build is complete.
+    // Everything else (like a group or bundle_data) has a stamp or phony
+    // output. The dependency output file should have computed what this is.
+    // This won't be valid unless the build is complete.
     if (!build_complete) {
       *err = Err(loc_for_error, kBuildIncompleteMsg);
       return false;