ninja/mac: Add iOS fields to ExtraPlistItems for ninja builds.

pylib/gyp/mac_tool.py

 #!/usr/bin/env python
 # Copyright (c) 2012 Google Inc. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Utility functions to perform Xcode-style build steps.
 
 These functions are executed via gyp-mac-tool when using the Makefile generator.
 """
 
 import fcntl
+import json
 import os
 import plistlib
 import re
 import shutil
 import string
 import subprocess
 import sys
 
 
 def main(args):
@@ skipping 96 matching lines @@
 
   def ExecCopyInfoPlist(self, source, dest, *keys):
     """Copies the |source| Info.plist to the destination directory |dest|."""
     # Read the source Info.plist into memory.
     fd = open(source, 'r')
     lines = fd.read()
     fd.close()
 
     # Insert synthesized key/value pairs (e.g. BuildMachineOSBuild).
     plist = plistlib.readPlistFromString(lines)
-    plist = dict(plist.items() + zip(keys[::2], keys[1::2]))
+    if keys:
+      plist = dict(plist.items() + json.loads(keys[0]).items())
     lines = plistlib.writePlistToString(plist)
 
     # Go through all the environment variables and replace them as variables in
     # the file.
     IDENT_RE = re.compile('[/\s]')
     for key in os.environ:
       if key.startswith('_'):
         continue
       evar = '${%s}' % key
       evalue = os.environ[key]
@@ skipping 102 matching lines @@
   def _Relink(self, dest, link):
     """Creates a symlink to |dest| named |link|. If |link| already exists,
     it is overwritten."""
     if os.path.lexists(link):
       os.remove(link)
     os.symlink(dest, link)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))