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..b2c87245e9575e5302c381e77153e292a1d900aa 100755 |
--- a/components/cronet/tools/package_ios.py |
+++ b/components/cronet/tools/package_ios.py |
@@ -90,37 +90,48 @@ 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_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) |
- |
- print 'Generating Ninja ' + gn_args |
- gn_result = run('gn gen %s --args=\'%s\'' % (build_dir, gn_args)) |
- if gn_result != 0: |
- return gn_result |
- |
- print 'Building ' + build_dir |
- build_result = run('ninja -C %s cronet_package' % build_dir, |
- extra_options) |
- if build_result != 0: |
- return build_result |
- |
- # Copy framework. |
- shutil.copytree(os.path.join(build_dir, 'Cronet.framework'), |
- os.path.join(out_dir, target_dir, 'Cronet.framework')) |
- # Copy symbols. |
- shutil.copytree(os.path.join(build_dir, 'Cronet.dSYM'), |
- os.path.join(out_dir, target_dir, 'Cronet.framework.dSYM')) |
+ 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: |
+ for target_cpu in target_cpus: |
kapishnikov
2017/05/17 16:02:49
The output has changed to contain thin libraries i
mef
2017/05/19 18:07:59
With latest changes in BUILD.gn we should be able
|
+ target_dir = '%s-%s-%s' % (build_config, target_device, target_cpu) |
+ 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" %s' % \ |
+ (target_cpu, gn_extra_args) |
+ |
+ print 'Generating Ninja ' + gn_args |
+ gn_result = run('gn gen %s --args=\'%s\'' % (build_dir, gn_args)) |
+ if gn_result != 0: |
+ return gn_result |
+ |
+ print 'Building ' + build_dir |
+ build_result = run('ninja -C %s cronet_package' % build_dir, |
+ extra_options) |
+ if build_result != 0: |
+ return build_result |
+ |
+ # Copy framework. |
+ shutil.copytree(os.path.join(build_dir, 'Cronet.framework'), |
+ os.path.join(out_dir, target_dir, 'Cronet.framework')) |
+ # Copy symbols. |
+ 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') |