commit 2ca0e81b0d276704d201ec881a1f93422f2b888b
author Sylvain Defresne <sdefresne@chromium.org> Wed Apr 15 17:38:16 2020 +0200
committer Commit Bot <commit-bot@chromium.org> Thu Apr 16 08:38:39 2020 +0000
tree 0cc1528f8fdc3ecec237c80c3970a6922ffa5d64
parent ec938ddaa276646eb8f1ab33e160c156011d8217

Fix formatting of COMPILER_FLAGS in generated project

Ensure that the formatting is the same as the one used by Xcode
to make comparing generated project with the upgraded version
easier.

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

src/gn/xcode_object.cc

diff --git a/src/gn/xcode_object.cc b/src/gn/xcode_object.cc
index 56b28a7..d10adf6 100644
--- a/src/gn/xcode_object.cc
+++ b/src/gn/xcode_object.cc
@@ -177,6 +177,18 @@
   out << value->Reference();
 }
 
+void PrintValue(std::ostream& out, IndentRules rules, CompilerFlags flags) {
+  out << "{COMPILER_FLAGS = \"";
+  switch (flags) {
+    case CompilerFlags::HELP:
+      out << "--help";
+      break;
+    case CompilerFlags::NONE:
+      break;
+  }
+  out << "\"; }";
+}
+
 template <typename ObjectClass>
 void PrintValue(std::ostream& out,
                 IndentRules rules,
@@ -439,11 +451,8 @@
   out << indent_str << Reference() << " = {";
   PrintProperty(out, rules, "isa", ToString(Class()));
   PrintProperty(out, rules, "fileRef", file_reference_);
-  if (compiler_flag_ == CompilerFlags::HELP) {
-    std::map<std::string, std::string> settings = {
-        {"COMPILER_FLAGS", "--help"},
-    };
-    PrintProperty(out, rules, "settings", settings);
+  if (compiler_flag_ != CompilerFlags::NONE) {
+    PrintProperty(out, rules, "settings", compiler_flag_);
   }
   out << "};\n";
 }