diff --git a/ci/builders/mac_ios_engine.json b/ci/builders/mac_ios_engine.json index 600f495929b0c..a8a4bb926462e 100644 --- a/ci/builders/mac_ios_engine.json +++ b/ci/builders/mac_ios_engine.json @@ -289,6 +289,53 @@ "script": "flutter/sky/tools/create_full_ios_framework.py", "language": "python3" }, + { + "name": "Debug-ios-Flutter-Extension-Safe.xcframework", + "parameters": [ + "--dst", + "out/debug_extension_safe", + "--arm64-out-dir", + "out/ios_debug_extension_safe", + "--simulator-x64-out-dir", + "out/ios_debug_sim_extension_safe", + "--simulator-arm64-out-dir", + "out/ios_debug_sim_arm64_extension_safe" + ], + "script": "flutter/sky/tools/create_full_ios_framework.py", + "language": "python3" + }, + { + "name": "Profile-ios-Flutter-Extension-Safe.xcframework", + "parameters": [ + "--dst", + "out/profile_extension_safe", + "--arm64-out-dir", + "out/ios_profile_extension_safe", + "--simulator-x64-out-dir", + "out/ios_debug_sim_extension_safe", + "--simulator-arm64-out-dir", + "out/ios_debug_sim_arm64_extension_safe" + ], + "script": "flutter/sky/tools/create_full_ios_framework.py", + "language": "python3" + }, + { + "name": "Release-ios-Flutter-Extension-Safe.xcframework", + "parameters": [ + "--dst", + "out/release_extension_safe", + "--arm64-out-dir", + "out/ios_release_extension_safe", + "--simulator-x64-out-dir", + "out/ios_debug_sim_extension_safe", + "--simulator-arm64-out-dir", + "out/ios_debug_sim_arm64_extension_safe", + "--dsym", + "--strip" + ], + "script": "flutter/sky/tools/create_full_ios_framework.py", + "language": "python3" + }, { "name": "Release-macos-gen-snapshots", "parameters": [ @@ -332,8 +379,23 @@ "realm": "production" }, { - "source": "out/release/extension_safe_Flutter.dSYM.zip", - "destination": "ios-release/extension_safe_Flutter.dSYM.zip", + "source": "out/debug_extension_safe/artifacts.zip", + "destination": "ios-extension-safe/artifacts.zip", + "realm": "production" + }, + { + "source": "out/profile_extension_safe/artifacts.zip", + "destination": "ios-profile-extension-safe/artifacts.zip", + "realm": "production" + }, + { + "source": "out/release_extension_safe/artifacts.zip", + "destination": "ios-release-extension-safe/artifacts.zip", + "realm": "production" + }, + { + "source": "out/release_extension_safe/Flutter.dSYM.zip", + "destination": "ios-release-extension-safe/Flutter.dSYM.zip", "realm": "production" } ] diff --git a/sky/tools/create_full_ios_framework.py b/sky/tools/create_full_ios_framework.py index 6aeaea94176b7..5858ddefb7b12 100644 --- a/sky/tools/create_full_ios_framework.py +++ b/sky/tools/create_full_ios_framework.py @@ -106,49 +106,10 @@ def main(): args, dst, framework, arm64_framework, simulator_framework, simulator_x64_framework, simulator_arm64_framework ) - - extension_safe_dst = os.path.join(dst, 'extension_safe') - create_extension_safe_framework( - args, extension_safe_dst, '%s_extension_safe' % arm64_out_dir, - '%s_extension_safe' % simulator_x64_out_dir, - '%s_extension_safe' % simulator_arm64_out_dir - ) - generate_gen_snapshot(args, dst, x64_out_dir, arm64_out_dir) zip_archive(dst) return 0 -def create_extension_safe_framework( # pylint: disable=too-many-arguments - args, dst, arm64_out_dir, simulator_x64_out_dir, simulator_arm64_out_dir -): - framework = os.path.join(dst, 'Flutter.framework') - simulator_framework = os.path.join(dst, 'sim', 'Flutter.framework') - arm64_framework = os.path.join(arm64_out_dir, 'Flutter.framework') - simulator_x64_framework = os.path.join( - simulator_x64_out_dir, 'Flutter.framework' - ) - simulator_arm64_framework = os.path.join( - simulator_arm64_out_dir, 'Flutter.framework' - ) - - if not os.path.isdir(arm64_framework): - print( - 'Cannot find extension safe iOS arm64 Framework at %s' % arm64_framework - ) - return 1 - - if not os.path.isdir(simulator_x64_framework): - print( - 'Cannot find extension safe iOS x64 simulator Framework at %s' % - simulator_x64_framework - ) - return 1 - - create_framework( - args, dst, framework, arm64_framework, simulator_framework, - simulator_x64_framework, simulator_arm64_framework - ) - return 0 def create_framework( # pylint: disable=too-many-arguments args, dst, framework, arm64_framework, simulator_framework, @@ -212,9 +173,7 @@ def zip_archive(dst): ios_file_with_entitlements = ['gen_snapshot_arm64'] ios_file_without_entitlements = [ 'Flutter.xcframework/ios-arm64/Flutter.framework/Flutter', - 'Flutter.xcframework/ios-arm64_x86_64-simulator/Flutter.framework/Flutter', - 'extension_safe/Flutter.xcframework/ios-arm64/Flutter.framework/Flutter', - 'extension_safe/Flutter.xcframework/ios-arm64_x86_64-simulator/Flutter.framework/Flutter' + 'Flutter.xcframework/ios-arm64_x86_64-simulator/Flutter.framework/Flutter' ] embed_codesign_configuration( os.path.join(dst, 'entitlements.txt'), ios_file_with_entitlements @@ -233,21 +192,12 @@ def zip_archive(dst): 'Flutter.xcframework', 'entitlements.txt', 'without_entitlements.txt', - 'extension_safe/Flutter.framework', - 'extension_safe/Flutter.xcframework', - 'extension_safe/sim', ], cwd=dst) if os.path.exists(os.path.join(dst, 'Flutter.dSYM')): subprocess.check_call(['zip', '-r', 'Flutter.dSYM.zip', 'Flutter.dSYM'], cwd=dst) - if os.path.exists(os.path.join(dst, 'extension_safe', 'Flutter.dSYM')): - subprocess.check_call([ - 'zip', '-r', 'extension_safe_Flutter.dSYM.zip', 'Flutter.dSYM' - ], - cwd=dst) - def process_framework(args, dst, framework, framework_binary): if args.dsym: