commit 61be3f2e5399439ca46de083d44de8fd1796adb0
author Julie Hockett <juliehockett@google.com> Thu Jul 11 10:20:17 2019 -0700
committer Commit Bot <commit-bot@chromium.org> Thu Jul 11 20:12:38 2019 +0000
tree 595cdb4917191336b13ded6b5bd5bd895d8a8852
parent bf27729dcb130e609049b3e697589968bf89b0fc

Fix desc to handle single-value outputs correctly

Change-Id: Ie1dd39a7bc676bdab0a59bb75112188e44ecadfa
Reviewed-on: https://gn-review.googlesource.com/c/gn/+/5620
Commit-Queue: Julie Hockett <juliehockett@google.com>
Reviewed-by: Brett Wilson <brettw@chromium.org>

tools/gn/command_desc.cc

diff --git a/tools/gn/command_desc.cc b/tools/gn/command_desc.cc
index a499384..6531a8e 100644
--- a/tools/gn/command_desc.cc
+++ b/tools/gn/command_desc.cc
@@ -229,20 +229,26 @@
 }
 
 // Outputs need special processing when output patterns are present.
-void ProcessOutputs(base::DictionaryValue* target) {
+void ProcessOutputs(base::DictionaryValue* target, bool files_only) {
   base::ListValue* patterns = nullptr;
   base::ListValue* outputs = nullptr;
   target->GetList("output_patterns", &patterns);
   target->GetList(variables::kOutputs, &outputs);
 
+  int indent = 0;
   if (outputs || patterns) {
-    OutputString("\noutputs\n");
-    int indent = 1;
+    if (!files_only) {
+      OutputString("\noutputs\n");
+      indent = 1;
+    }
     if (patterns) {
-      OutputString("  Output patterns\n");
-      indent = 2;
+      if (!files_only) {
+        OutputString("  Output patterns\n");
+        indent = 2;
+      }
       PrintValue(patterns, indent);
-      OutputString("\n  Resolved output file list\n");
+      if (!files_only)
+        OutputString("\n  Resolved output file list\n");
     }
     if (outputs)
       PrintValue(outputs, indent);
@@ -323,6 +329,10 @@
   }
   // Print single value
   if (!what.empty() && dict->size() == 1 && single_target) {
+    if (what == variables::kOutputs) {
+      ProcessOutputs(dict.get(), true);
+      return true;
+    }
     base::DictionaryValue::Iterator iter(*dict);
     auto pair = handler_map.find(what);
     if (pair != handler_map.end())
@@ -352,7 +362,7 @@
   HandleProperty(variables::kScript, handler_map, v, dict);
   HandleProperty(variables::kArgs, handler_map, v, dict);
   HandleProperty(variables::kDepfile, handler_map, v, dict);
-  ProcessOutputs(dict.get());
+  ProcessOutputs(dict.get(), false);
   HandleProperty("bundle_data", handler_map, v, dict);
   HandleProperty(variables::kArflags, handler_map, v, dict);
   HandleProperty(variables::kAsmflags, handler_map, v, dict);