[Cronet] Build static libcronet.a for iOS with complete dependencies.

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 956d545b9c900d3751c12ec5cd7ef59bfadf6614..0773b869452c8fe6e1993308186b1c843aa3ed10 100755
--- a/components/cronet/tools/package_ios.py
+++ b/components/cronet/tools/package_ios.py
@@ -90,19 +90,27 @@ def package_ios_framework_using_gn(out_dir='out/Framework', extra_options=''):
   # Package all builds in the output directory
   os.makedirs(out_dir)
   build_dir = ''
-  for (build_config, gn_extra_args) in [('Debug', 'is_debug=true use_xcode_clang=true'),
-        ('Release', 'is_debug=false enable_stripping=true is_official_build=true')]:
-    for (target_device, target_cpu, additional_cpu) in [('os', 'arm', 'arm64'),
-        ('simulator', 'x86', 'x64')]:
-      target_dir = '%s-iphone%s' % (build_config, target_device)
+  build_configs = [
+      ('Release', 'is_debug=false is_official_build=true'),
+      ('Debug', 'is_debug=true use_xcode_clang=true'),
+  ]
+  target_devices = [
+      ('iphoneos', ['arm', 'arm64']),
+      ('iphonesimulator', ['x64']),
+  ]
+  for (build_config, gn_extra_args) in build_configs:
+    for (target_device, target_cpus) in target_devices:
+      target_dir = '%s-%s' % (build_config, target_device)
       build_dir = os.path.join("out", target_dir)
       gn_args = 'target_os="ios" enable_websockets=false ' \
                 'is_cronet_build=true is_component_build=false ' \
                 'disable_file_support=true disable_ftp_support=true ' \
                 'use_platform_icu_alternatives=true ' \
                 'disable_brotli_filter=true enable_dsyms=true ' \
-                'target_cpu="%s" additional_target_cpus = ["%s"] %s' % \
-                (target_cpu, additional_cpu, gn_extra_args)
+                'target_cpu="%s" %s' % \
+                (target_cpus[0], gn_extra_args)
+
+      gn_args += ' additional_target_cpus = ["arm64"] '
 
       print 'Generating Ninja ' + gn_args
       gn_result = run('gn gen %s --args=\'%s\'' % (build_dir, gn_args))
@@ -122,6 +130,10 @@ def package_ios_framework_using_gn(out_dir='out/Framework', extra_options=''):
       shutil.copytree(os.path.join(build_dir, 'Cronet.dSYM'),
           os.path.join(out_dir, target_dir, 'Cronet.framework.dSYM'))
 
+      # Copy static library.
+      shutil.copy2(os.path.join(build_dir, 'cronet', 'libcronet.a'),
+          os.path.join(out_dir, target_dir))
+
   # Copy common files from last built package.
   package_dir = os.path.join(build_dir, 'cronet')
   shutil.copy2(os.path.join(package_dir, 'AUTHORS'), out_dir)