iOS,macOS: add unsigned_binaries.txt

sky/tools/create_ios_framework.py

@@ -168,34 +168,44 @@ def zip_archive(dst, args):
   # the framework's `verifyCodeSignedTestRunner`.
   #
   # See: https://github.com/flutter/flutter/blob/62382c7b83a16b3f48dc06c19a47f6b8667005a5/dev/bots/suite_runners/run_verify_binaries_codesigned_tests.dart#L82-L130
+
+  # Binaries that must be codesigned and require entitlements for particular APIs.
   with_entitlements = ['gen_snapshot_arm64']
   with_entitlements_file = os.path.join(dst, 'entitlements.txt')
   sky_utils.write_codesign_config(with_entitlements_file, with_entitlements)
 
+  # Binaries that must be codesigned and DO NOT require entitlements.
   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',
   ]
+  without_entitlements_file = os.path.join(dst, 'without_entitlements.txt')
+  sky_utils.write_codesign_config(without_entitlements_file, without_entitlements)
+
+  # Binaries that will not be codesigned.
+  unsigned_binaries = []
   if args.dsym:
-    without_entitlements.extend([
+    unsigned_binaries.extend([
         'Flutter.xcframework/ios-arm64/dSYMs/Flutter.framework.dSYM/Contents/Resources/DWARF/Flutter',
         'extension_safe/Flutter.xcframework/ios-arm64/dSYMs/Flutter.framework.dSYM/Contents/Resources/DWARF/Flutter',
     ])
-
-  without_entitlements_file = os.path.join(dst, 'without_entitlements.txt')
-  sky_utils.write_codesign_config(without_entitlements_file, without_entitlements)
+  unsigned_binaries_file = os.path.join(dst, 'unsigned_binaries.txt')
+  sky_utils.write_codesign_config(unsigned_binaries_file, unsigned_binaries)
   # pylint: enable=line-too-long
 
   zip_contents = [
       'gen_snapshot_arm64',
       'Flutter.xcframework',
       'entitlements.txt',
       'without_entitlements.txt',
+      'unsigned_binaries.txt',
       'extension_safe/Flutter.xcframework',
   ]
-  sky_utils.assert_valid_codesign_config(dst, zip_contents, with_entitlements, without_entitlements)
+  sky_utils.assert_valid_codesign_config(
+      dst, zip_contents, with_entitlements, without_entitlements, unsigned_binaries
+  )
   sky_utils.create_zip(dst, 'artifacts.zip', zip_contents)
 
 

sky/tools/create_macos_framework.py

@@ -121,28 +121,38 @@ def zip_xcframework_archive(dst, args):
   # the framework's `verifyCodeSignedTestRunner`.
   #
   # See: https://github.com/flutter/flutter/blob/62382c7b83a16b3f48dc06c19a47f6b8667005a5/dev/bots/suite_runners/run_verify_binaries_codesigned_tests.dart#L82-L130
+
+  # Binaries that must be codesigned and require entitlements for particular APIs.
   with_entitlements = []
   with_entitlements_file = os.path.join(dst, 'entitlements.txt')
   sky_utils.write_codesign_config(with_entitlements_file, with_entitlements)
 
+  # Binaries that must be codesigned and DO NOT require entitlements.
   without_entitlements = [
       'FlutterMacOS.xcframework/macos-arm64_x86_64/FlutterMacOS.framework/Versions/A/FlutterMacOS',
   ]
+  without_entitlements_file = os.path.join(dst, 'without_entitlements.txt')
+  sky_utils.write_codesign_config(without_entitlements_file, without_entitlements)
+
+  # Binaries that will not be codesigned.
+  unsigned_binaries = []
   if args.dsym:
-    without_entitlements.extend([
+    unsigned_binaries.extend([
         'FlutterMacOS.xcframework/macos-arm64_x86_64/dSYMs/FlutterMacOS.framework.dSYM/Contents/Resources/DWARF/FlutterMacOS',
     ])
-
-  without_entitlements_file = os.path.join(dst, 'without_entitlements.txt')
-  sky_utils.write_codesign_config(without_entitlements_file, without_entitlements)
+  unsigned_binaries_file = os.path.join(dst, 'unsigned_binaries.txt')
+  sky_utils.write_codesign_config(unsigned_binaries_file, unsigned_binaries)
   # pylint: enable=line-too-long
 
   zip_contents = [
       'FlutterMacOS.xcframework',
       'entitlements.txt',
       'without_entitlements.txt',
+      'unsigned_binaries.txt',
   ]
-  sky_utils.assert_valid_codesign_config(dst, zip_contents, with_entitlements, without_entitlements)
+  sky_utils.assert_valid_codesign_config(
+      dst, zip_contents, with_entitlements, without_entitlements, unsigned_binaries
+  )
   sky_utils.create_zip(dst, 'framework.zip', zip_contents)
 
 

sky/tools/sky_utils.py

@@ -25,7 +25,9 @@ def assert_file(path, what):
     sys.exit(os.EX_NOINPUT)
 
 
-def assert_valid_codesign_config(framework_dir, zip_contents, entitlements, without_entitlements):
+def assert_valid_codesign_config(
+    framework_dir, zip_contents, entitlements, without_entitlements, unsigned_binaries
+):
   """Exits with exit code 1 if the codesign configuration contents are incorrect.
   All Mach-O binaries found within zip_contents exactly must be listed in
   either entitlements or without_entitlements."""
@@ -37,7 +39,11 @@ def assert_valid_codesign_config(framework_dir, zip_contents, entitlements, with
     log_error('ERROR: duplicate value(s) found in without_entitlements.txt')
     sys.exit(os.EX_DATAERR)
 
-  if _contains_duplicates(entitlements + without_entitlements):
+  if _contains_duplicates(unsigned_binaries):
+    log_error('ERROR: duplicate value(s) found in unsigned_binaries.txt')
+    sys.exit(os.EX_DATAERR)
+
+  if _contains_duplicates(entitlements + without_entitlements + unsigned_binaries):
     log_error('ERROR: value(s) found in both entitlements and without_entitlements.txt')
     sys.exit(os.EX_DATAERR)
 
@@ -52,26 +58,33 @@ def assert_valid_codesign_config(framework_dir, zip_contents, entitlements, with
         if _is_macho_binary(file):
           binaries.add(os.path.relpath(file, framework_dir))
 
-  # Verify that all Mach-O binaries are listed in either entitlements or without_entitlements.
-  listed_binaries = set(entitlements + without_entitlements)
+  # Verify that all Mach-O binaries are listed in either entitlements,
+  # without_entitlements, or unsigned_binaries.
+  listed_binaries = set(entitlements + without_entitlements + unsigned_binaries)
   if listed_binaries != binaries:
     log_error(
-        'ERROR: binaries listed in entitlements.txt and without_entitlements.txt do not '
-        'match the set of binaries in the files to be zipped'
+        'ERROR: binaries listed in entitlements.txt, without_entitlements.txt, and'
+        'unsigned_binaries.txt do not match the set of binaries in the files to be zipped'
     )
     log_error('Binaries found in files to be zipped:')
     for file in sorted(binaries):
       log_error('    ' + file)
 
     not_listed = sorted(binaries - listed_binaries)
     if not_listed:
-      log_error('Binaries NOT LISTED in entitlements.txt/without_entitlements.txt:')
+      log_error(
+          'Binaries NOT LISTED in entitlements.txt, without_entitlements.txt, '
+          'unsigned_binaries.txt:'
+      )
       for file in not_listed:
         log_error('    ' + file)
 
     not_found = sorted(listed_binaries - binaries)
     if not_found:
-      log_error('Binaries listed in entitlements.txt/without_entitlements.txt but NOT FOUND:')
+      log_error(
+          'Binaries listed in entitlements.txt, without_entitlements.txt, '
+          'unsigned_binaries.txt but NOT FOUND:'
+      )
       for file in not_found:
         log_error('    ' + file)
     sys.exit(os.EX_NOINPUT)