GN: Work on Mac module search path.

tools/gn/gyp_binary_target_writer.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "tools/gn/gyp_binary_target_writer.h"
 
 #include <set>
 
 #include "base/logging.h"
 #include "base/strings/string_util.h"
@@ skipping 455 matching lines @@
 
   // Architecture. GYP reads this value and uses it to generate the -arch
   // flag, so we always want to remove it from the cflags (which is a side
   // effect of what GetMacArch does), even in cases where we don't use the
   // value (in the iOS arm below).
   std::string arch = GetMacArch(&flags.cflags);
   if (IsIOS(target)) {
     // When writing an iOS "target" (not host) target, we set VALID_ARCHS
     // instead of ARCHS and always use this hardcoded value. This matches the
     // GYP build.
-    Indent(indent + kExtraIndent) << "'VALID_ARCHS': 'armv7 i386',\n";
+    Indent(indent + kExtraIndent) << "'VALID_ARCHS': ['armv7', 'i386'],\n";
 
     // Tell XCode to target both iPhone and iPad. GN has no such concept.
     Indent(indent + kExtraIndent) << "'TARGETED_DEVICE_FAMILY': '1,2',\n";
 
     if (IsIOSSimulator(flags.cflags)) {
       Indent(indent + kExtraIndent) << "'SDKROOT': 'iphonesimulator',\n";
     } else {
       Indent(indent + kExtraIndent) << "'SDKROOT': 'iphoneos',\n";
       std::string min_ver = GetIPhoneVersionMin(&flags.cflags);
       if (!min_ver.empty()) {
@@ skipping 273 matching lines @@
     return;
 
   EscapeOptions options;
   options.mode = ESCAPE_JSON;
 
   Indent(indent) << "'" << name << "': [";
   WriteArrayValues(out_, values);
   out_ << " ],\n";
 }