build_testapps.py tvOS device profiles (#522)

* Update `build_testapps.py` to pass the target os (`iOS` or `tvOS`) to the `xcodebuild.py` build script.
* `xcodebuild.py` now populates the correct device profiles `appletvos` and `appletvsimulator` for `device` and `simulator` iOS SDK types, respectively.

Author: DellaBitta

scripts/gha/build_testapps.py

@@ -474,7 +474,8 @@ def build_testapp(dir_helper, api_config, ios_config, target):
             os.path.join(dir_helper.unity_project_editor_dir, "dev.entitlements"))
       _run(arg_builder.get_args_to_open_project(build_flags))
       logging.info("Finished building target %s xcode project", target)
-      run_xcodebuild(dir_helper=dir_helper, ios_config=ios_config, device_type = device_type)
+      run_xcodebuild(dir_helper=dir_helper, ios_config=ios_config, device_type = device_type,
+          target_os = target)
   else:
     if api_config.minify:
       build_flags += ["-AppBuilderHelper.minify", api_config.minify]
@@ -617,7 +618,7 @@ def perform_in_editor_tests(dir_helper, retry_on_license_check=True):
   return text
 
 
-def run_xcodebuild(dir_helper, ios_config, device_type):
+def run_xcodebuild(dir_helper, ios_config, device_type, target_os):
   """Uses xcode project generated by Unity to build an iOS or tvOS binary."""
   build_output_dir = os.path.join(dir_helper.output_dir, "ios_output_"+device_type)
   _run(
@@ -626,6 +627,7 @@ def run_xcodebuild(dir_helper, ios_config, device_type):
           scheme=ios_config.scheme,
           output_dir=build_output_dir,
           ios_sdk=_IOS_SDK[device_type],
+          target_os=target_os,
           configuration=ios_config.configuration))
   if device_type == _DEVICE_REAL:
     xcodebuild.generate_unsigned_ipa(

scripts/gha/integration_testing/xcodebuild.py

@@ -36,7 +36,7 @@
 import shutil
 
 
-def get_args_for_build(path, scheme, output_dir, ios_sdk, configuration):
+def get_args_for_build(path, scheme, output_dir, ios_sdk, target_os, configuration):
   """Constructs subprocess args for an unsigned xcode build.
 
   Args:
@@ -45,7 +45,8 @@ def get_args_for_build(path, scheme, output_dir, ios_sdk, configuration):
     scheme (str): Name of the scheme to build.
     output_dir (str): Directory for the resulting build artifacts. Will be
         created if it doesn't already exist.
-    ios_sdk (str): Where this build will be run: device or simulator.
+    ios_sdk (str): Where this build will be run: "device" or "simulator".
+    target_os (str): one of "iOS" or "tvOS".
     configuration (str): Value for the -configuration flag.
 
   Returns:
@@ -54,7 +55,7 @@ def get_args_for_build(path, scheme, output_dir, ios_sdk, configuration):
   """
   args = [
       "xcodebuild",
-      "-sdk", _get_ios_env_from_target(ios_sdk),
+      "-sdk", _get_ios_env_from_target(ios_sdk, target_os),
       "-scheme", scheme,
       "-configuration", configuration,
       "-quiet",
@@ -79,14 +80,24 @@ def get_args_for_build(path, scheme, output_dir, ios_sdk, configuration):
   return args
 
 
-def _get_ios_env_from_target(ios_sdk):
+def _get_ios_env_from_target(ios_sdk, target_os):
   """Return a value for the -sdk flag based on the target (device/simulator)."""
-  if ios_sdk == "device":
-    return "iphoneos"
-  elif ios_sdk == "simulator":
-    return "iphonesimulator"
+  if target_os == "iOS":
+    if ios_sdk == "device":
+      return "iphoneos"
+    elif ios_sdk == "simulator":
+      return "iphonesimulator"
+    else:
+      raise ValueError("Unrecognized iOS ios_sdk paramter: %s" % ios_sdk)
+  elif target_os == "tvOS":
+    if ios_sdk == "device":
+      return "appletvos"
+    elif ios_sdk == "simulator":
+      return "appletvsimulator"
+    else:
+      raise ValueError("Unrecognized tvOS ios_sdk parameter: %s" % sdk)
   else:
-    raise ValueError("Unrecognized ios_sdk: %s" % ios_sdk)
+    raise ValueError("Unrecognized target_os %s for ios_sdk %s" % (target_os, ios_sdk))
 
 
 def generate_unsigned_ipa(output_dir, configuration):