Cronet Dynamic Framework for iOS

components/cronet/tools/package_ios.py

Index: components/cronet/tools/package_ios.py
diff --git a/components/cronet/tools/package_ios.py b/components/cronet/tools/package_ios.py
index 520cb65bb232bcad2059ca22a59620c44297fb03..83cdff8ae5553c95fd8d3e2bf95b79dd7b8e45ba 100755
--- a/components/cronet/tools/package_ios.py
+++ b/components/cronet/tools/package_ios.py
@@ -13,7 +13,7 @@ import shutil
 import sys
 
 def run(command, extra_options=''):
-  command = command + ' ' + extra_options
+  command = command + ' ' + ' '.join(extra_options)
   print command
   return os.system(command)
 
@@ -38,6 +38,7 @@ def copy_build_dir(target_dir, build_dir):
     print('Directory not copied. Error: %s' % e)
   return 0
 
+
 def package_ios(out_dir, build_dir, build_config):
   build_dir_sim = build_dir
   build_dir_dev = build_dir +'-iphoneos'
@@ -51,6 +52,31 @@ def package_ios(out_dir, build_dir, build_config):
                         "cronet/libcronet_standalone.a")
 
 
+def package_ios_framework(out_dir='out/Framework', extra_options=''):
+  print 'Building Cronet Dynamic Framework...'
+
+  # Use Ninja to build all possible combinations.
+  build_dirs = ['Debug-iphonesimulator',
+                'Debug-iphoneos',
+                'Release-iphonesimulator',
+                'Release-iphoneos']
+  for build_dir in build_dirs:
+    print 'Building ' + build_dir
+    build_result = run('ninja -C out/' + build_dir + ' cronet_framework',
+                       extra_options)
+    if build_result != 0:
+      return build_result
+
+  # Package all builds in the output directory
+  os.makedirs(out_dir)
+  for build_dir in build_dirs:
+    shutil.copytree(os.path.join('out', build_dir, 'Cronet.framework'),
+                    os.path.join(out_dir, build_dir, 'Cronet.framework'))
+    if 'Release' in build_dir:
+      shutil.copytree(os.path.join('out', build_dir, 'Cronet.framework.dSYM'),
+                      os.path.join(out_dir, build_dir, 'Cronet.framework.dSYM'))
+
+
 def main():
   parser = argparse.ArgumentParser()
   parser.add_argument('out_dir', nargs=1, help='path to output directory')
@@ -60,20 +86,33 @@ def main():
                       help='use release configuration')
   parser.add_argument('-r', '--release', action='store_true',
                       help='use release configuration')
+  parser.add_argument('--framework', action='store_true',
+                      help='build Cronet dynamic framework')
 
   options, extra_options_list = parser.parse_known_args()
   print options
   print extra_options_list
 
+  out_dir = options.out_dir[0]
+
+  # Make sure that the output directory does not exist
+  if os.path.exists(out_dir):
+    print >>sys.stderr, 'The output directory already exists: ' + out_dir
+    return 1
+
   gyp_defines = 'GYP_DEFINES="OS=ios enable_websockets=0 '+ \
       'disable_file_support=1 disable_ftp_support=1 '+ \
       'enable_errorprone=1 use_platform_icu_alternatives=1 ' + \
-      'disable_brotli_filter=1 target_subarch=both"'
+      'disable_brotli_filter=1 chromium_ios_signing=0 ' + \
+      'target_subarch=both"'
   if not options.skip_gyp:
     run (gyp_defines + ' gclient runhooks')
 
-  return package_ios(options.out_dir[0], "out/Release", "opt") or \
-         package_ios(options.out_dir[0], "out/Debug", "dbg")
+  if options.framework:
+    return package_ios_framework(out_dir, extra_options_list)
+
+  return package_ios(out_dir, "out/Release", "opt") or \
+         package_ios(out_dir, "out/Debug", "dbg")
 
 
 if __name__ == '__main__':