tv & watch support

Author: hiroshihorie

config/apple/codesign.py

@@ -106,6 +106,14 @@ def Kind(platform, extension):
       return 'xros'
     if platform == 'xrsimulator':
       return 'xrsimulator'
+    if platform == 'appletvos':
+      return 'appletvos'
+    if platform == 'appletvsimulator':
+      return 'appletvsimulator'
+    if platform == 'watchos':
+      return 'watchos'
+    if platform == 'watchsimulator':
+      return 'watchsimulator'
     if platform == 'macosx':
       if extension == '.framework':
         return 'mac_framework'

config/apple/sdk_info.py

@@ -133,17 +133,8 @@ def main():
                       default='.',
                       help='Value of gn $root_build_dir')
   parser.add_argument('platform',
-                      choices=[
-                          'appletvos',
-                          'appletvsimulator',
-                          'iphoneos',
-                          'iphonesimulator',
-                          'macosx',
-                          'watchos',
-                          'watchsimulator',
-						  'xros', 
-						  'xrsimulator'
-                      ])
+                      choices=['iphoneos', 'iphonesimulator', 'macosx', 'xros', 'xrsimulator', 'appletvos',
+                               'appletvsimulator', 'watchos', 'watchsimulator'])
   args = parser.parse_args()
   if args.developer_dir:
     os.environ['DEVELOPER_DIR'] = args.developer_dir

config/ios/BUILD.gn

@@ -41,6 +41,14 @@ config("compiler") {
     triplet_environment = ""
   } else if (target_environment == "xrsimulator") {
     triplet_environment = "-simulator"
+  } else if (target_environment == "appletv") {
+    triplet_environment = ""
+  } else if (target_environment == "appletvsimulator") {
+    triplet_environment = "-simulator"
+  } else if (target_environment == "watch") {
+    triplet_environment = ""
+  } else if (target_environment == "watchsimulator") {
+    triplet_environment = "-simulator"
   } else if (target_environment == "catalyst") {
     triplet_environment = "-macabi"
   } else {
@@ -56,6 +64,10 @@ config("compiler") {
 
   if (target_environment == "xrdevice" || target_environment == "xrsimulator") {
     triplet_os = "apple-xros"
+  } else if (target_environment == "appletv" || target_environment == "appletvsimulator") {
+    triplet_os = "apple-tvos"
+  } else if (target_environment == "watch" || target_environment == "watchsimulator") {
+    triplet_os = "apple-watchos"
   }
 
   # Set target.
@@ -208,6 +220,14 @@ config("ios_dynamic_flags") {
     _swift_compatibility_libs_suffix = "xros"
   } else if (target_environment == "xrsimulator") {
     _swift_compatibility_libs_suffix = "xrsimulator"
+  } else if (target_environment == "appletv") {
+    _swift_compatibility_libs_suffix = "appletvos"
+  } else if (target_environment == "appletvsimulator") {
+    _swift_compatibility_libs_suffix = "appletvsimulator"
+  } else if (target_environment == "watch") {
+    _swift_compatibility_libs_suffix = "watchos"
+  } else if (target_environment == "watchsimulator") {
+    _swift_compatibility_libs_suffix = "watchsimulator"
   } else if (target_environment == "catalyst") {
     # The Swift compatibility libraries have changed location starting with
     # Xcode 13.0, so check the version of Xcode when deciding which path to

config/ios/config.gni

@@ -21,4 +21,6 @@ if (target_environment == "") {
 }
 
 assert(target_environment == "simulator" || target_environment == "device" ||
-       target_environment == "catalyst" || target_environment == "xrdevice" || target_environment == "xrsimulator")
+       target_environment == "catalyst" || target_environment == "xrdevice" || target_environment == "xrsimulator" ||
+       target_environment == "appletv" ||target_environment == "appletvsimulator" ||
+       target_environment == "watch" ||target_environment == "watchsimulator")

config/ios/ios_sdk.gni

@@ -63,35 +63,33 @@ ios_use_xcode_symlinks =
 
 if (ios_sdk_path == "") {
   # Compute default target.
-  if (target_platform == "iphoneos") {
-    if (target_environment == "simulator") {
-      ios_sdk_name = "iphonesimulator"
-      ios_sdk_platform = "iPhoneSimulator"
-    } else if (target_environment == "device") {
-      ios_sdk_name = "iphoneos"
-      ios_sdk_platform = "iPhoneOS"
-    } else if (target_environment == "xrdevice") {
-      ios_sdk_name = "xros"
-      ios_sdk_platform = "XROS"
-    } else if (target_environment == "xrsimulator") {
-      ios_sdk_name = "xrsimulator"
-      ios_sdk_platform = "XRSimulator"
-    } else if (target_environment == "catalyst") {
-      ios_sdk_name = "macosx"
-      ios_sdk_platform = "MacOSX"
-    } else {
-      assert(false, "unsupported target_environment=$target_environment")
-    }
-  } else if (target_platform == "tvos") {
-    if (target_environment == "simulator") {
-      ios_sdk_name = "appletvsimulator"
-      ios_sdk_platform = "AppleTVSimulator"
-    } else if (target_environment == "device") {
-      ios_sdk_name = "appletvos"
-      ios_sdk_platform = "AppleTVOS"
-    } else {
-      assert(false, "unsupported target_environment=$target_environment")
-    }
+  if (target_environment == "simulator") {
+    ios_sdk_name = "iphonesimulator"
+    ios_sdk_platform = "iPhoneSimulator"
+  } else if (target_environment == "device") {
+    ios_sdk_name = "iphoneos"
+    ios_sdk_platform = "iPhoneOS"
+  } else if (target_environment == "xrdevice") {
+    ios_sdk_name = "xros"
+    ios_sdk_platform = "XROS"
+  } else if (target_environment == "xrsimulator") {
+    ios_sdk_name = "xrsimulator"
+    ios_sdk_platform = "XRSimulator"
+  } else if (target_environment == "watch") {
+    ios_sdk_name = "watchos"
+    ios_sdk_platform = "WatchOS"
+  } else if (target_environment == "watchsimulator") {
+    ios_sdk_name = "watchsimulator"
+    ios_sdk_platform = "WatchSimulator"
+  } else if (target_environment == "appletv") {
+    ios_sdk_name = "appletvos"
+    ios_sdk_platform = "AppleTVOS"
+  } else if (target_environment == "appletvsimulator") {
+    ios_sdk_name = "appletvsimulator"
+    ios_sdk_platform = "AppleTVSimulator"
+  } else if (target_environment == "catalyst") {
+    ios_sdk_name = "macosx"
+    ios_sdk_platform = "MacOSX"
   } else {
     assert(false, "unsupported target_platform=$target_platform")
   }

config/ios/rules.gni

@@ -830,7 +830,9 @@ template("ios_framework_bundle") {
     _public_headers = invoker.public_headers
 
     _framework_root_dir = "$root_out_dir/$_output_name.framework"
-    if (target_environment == "simulator" || target_environment == "device" || target_environment == "xrdevice" || target_environment == "xrsimulator") {
+    if (target_environment == "simulator" || target_environment == "device" || target_environment == "xrdevice" ||
+        target_environment == "xrsimulator" || target_environment == "appletv" || target_environment == "appletvsimulator" || 
+        target_environment == "watch" || target_environment == "watchsimulator") {
       _framework_contents_dir = _framework_root_dir
     } else if (target_environment == "catalyst") {
       _framework_contents_dir = "$_framework_root_dir/Versions/A"