Add support for iOS WatchKit apps in GYP

pylib/gyp/generator/xcode.py

Index: pylib/gyp/generator/xcode.py
diff --git a/pylib/gyp/generator/xcode.py b/pylib/gyp/generator/xcode.py
index f39f20209a364387dd2d611e715149b5dcf7ee4c..d97b0a2e23c82f6c01d3e63c3f22916d39324fee 100644
--- a/pylib/gyp/generator/xcode.py
+++ b/pylib/gyp/generator/xcode.py
@@ -70,6 +70,8 @@ generator_additional_path_sections = [
 # configurations.
 generator_additional_non_configuration_keys = [
   'ios_app_extension',
+  'ios_watch_app',
+  'ios_watchkit_extension',
   'mac_bundle',
   'mac_bundle_resources',
   'mac_framework_headers',
@@ -654,6 +656,9 @@ def GenerateOutput(target_list, target_dicts, data, params):
       'loadable_module+xctest':      'com.apple.product-type.bundle.unit-test',
       'shared_library+bundle':       'com.apple.product-type.framework',
       'executable+extension+bundle': 'com.apple.product-type.app-extension',
+      'executable+watch+extension+bundle':
+          'com.apple.product-type.watchkit-extension',
+      'executable+watch+bundle': 'com.apple.product-type.application.watchapp',
     }
 
     target_properties = {
@@ -664,7 +669,9 @@ def GenerateOutput(target_list, target_dicts, data, params):
     type = spec['type']
     is_xctest = int(spec.get('mac_xctest_bundle', 0))
     is_bundle = int(spec.get('mac_bundle', 0)) or is_xctest
-    is_extension = int(spec.get('ios_app_extension', 0))
+    is_app_extension = int(spec.get('ios_app_extension', 0))
+    is_watchkit_extension = int(spec.get('ios_watchkit_extension', 0))
+    is_watch_app = int(spec.get('ios_watch_app', 0))
     if type != 'none':
       type_bundle_key = type
       if is_xctest:
@@ -672,10 +679,18 @@ def GenerateOutput(target_list, target_dicts, data, params):
         assert type == 'loadable_module', (
             'mac_xctest_bundle targets must have type loadable_module '
             '(target %s)' % target_name)
-      elif is_extension:
+      elif is_app_extension:
         assert is_bundle, ('ios_app_extension flag requires mac_bundle '
             '(target %s)' % target_name)
         type_bundle_key += '+extension+bundle'
+      elif is_watchkit_extension:
+        assert is_bundle, ('ios_watchkit_extension flag requires mac_bundle '
+            '(target %s)' % target_name)
+        type_bundle_key += '+watch+extension+bundle'
+      elif is_watch_app:
+        assert is_bundle, ('ios_watch_app flag requires mac_bundle '
+            '(target %s)' % target_name)
+        type_bundle_key += '+watch+bundle'
       elif is_bundle:
         type_bundle_key += '+bundle'