commit fb5a4a366b045af92265fdb2c036c15c8cd0c991
author Jordan Rose <jrose@signal.org> Mon Jul 31 22:31:37 2023
committer WebRTC LUCI CQ <webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu Aug 03 07:02:30 2023
tree c780c662da66de9089243fbd37657db9a9655cef
parent 33eff43a12ece5ecf2c0b99c9f5c294d46e6f9b4

build_ios_libs.py: Allow customizing the deployment target

Previously, this script hardcoded deployment targets for device,
simulator, and Catalyst builds. This commit turns those into minimums
and allows callers to pass a higher version with --deployment-target.

Bug: None
Change-Id: I9398a8466dfa35ebac5e198aef6ec4f521054cc6
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/314420
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#40506}

tools_webrtc/ios/build_ios_libs.py

diff --git a/tools_webrtc/ios/build_ios_libs.py b/tools_webrtc/ios/build_ios_libs.py
index 764c378..3ab0cbe 100755
--- a/tools_webrtc/ios/build_ios_libs.py
+++ b/tools_webrtc/ios/build_ios_libs.py
@@ -39,7 +39,7 @@
 DEFAULT_ARCHS = [
     'device:arm64', 'simulator:arm64', 'simulator:x64'
 ]
-IOS_DEPLOYMENT_TARGET = {
+IOS_MINIMUM_DEPLOYMENT_TARGET = {
     'device': '12.0',
     'simulator': '12.0',
     'catalyst': '14.0'
@@ -99,6 +99,11 @@
                       action='store_true',
                       default=False,
                       help='Use RBE to build.')
+  parser.add_argument('--deployment-target',
+                      default=IOS_MINIMUM_DEPLOYMENT_TARGET['device'],
+                      help='Raise the minimum deployment target to build for. '
+                      'Cannot be lowered below 12.0 for iOS/iPadOS '
+                      'and 14.0 for Catalyst.')
   parser.add_argument(
       '--extra-gn-args',
       default=[],
@@ -151,6 +156,12 @@
   return result
 
 
+def _VersionMax(*versions):
+  return max(
+      *versions,
+      key=lambda version: [int(component) for component in version.split('.')])
+
+
 def BuildWebRTC(output_dir, target_environment, target_arch, flavor,
                 gn_target_name, ios_deployment_target, libvpx_build_vp9,
                 use_goma, use_remoteexec, extra_gn_args):
@@ -234,6 +245,8 @@
   framework_paths = []
   all_lib_paths = []
   for (environment, archs) in list(architectures.items()):
+    ios_deployment_target = _VersionMax(
+        args.deployment_target, IOS_MINIMUM_DEPLOYMENT_TARGET[environment])
     framework_path = os.path.join(args.output_dir, environment)
     framework_paths.append(framework_path)
     lib_paths = []
@@ -241,8 +254,8 @@
       lib_path = os.path.join(framework_path, arch + '_libs')
       lib_paths.append(lib_path)
       BuildWebRTC(lib_path, environment, arch, args.build_config,
-                  gn_target_name, IOS_DEPLOYMENT_TARGET[environment],
-                  LIBVPX_BUILD_VP9, args.use_goma, args.use_remoteexec, gn_args)
+                  gn_target_name, ios_deployment_target, LIBVPX_BUILD_VP9,
+                  args.use_goma, args.use_remoteexec, gn_args)
     all_lib_paths.extend(lib_paths)
 
     # Combine the slices.