Commit 8cf92945 authored by Misha Efimov's avatar Misha Efimov Committed by Commit Bot

[Cronet] Explicitly set ios_deployment_target = "9.0" in Cronet builds.

Bug: 775564
Cq-Include-Trybots: master.tryserver.chromium.android:android_cronet_tester;master.tryserver.chromium.mac:ios-simulator-cronet
Change-Id: Ia042509d3686d501f2b459c1fe03956422b5af4a
Reviewed-on: https://chromium-review.googlesource.com/760487
Commit-Queue: Misha Efimov <mef@chromium.org>
Reviewed-by: default avatarsmut <smut@google.com>
Cr-Commit-Position: refs/heads/master@{#515422}
parent 4cfec6e6
...@@ -80,7 +80,7 @@ def main(): ...@@ -80,7 +80,7 @@ def main():
target_os = 'ios' target_os = 'ios'
test_target = 'cronet_test' test_target = 'cronet_test'
gn_args = 'is_cronet_build=true is_component_build=false ' \ gn_args = 'is_cronet_build=true is_component_build=false ' \
'use_xcode_clang=true ' 'use_xcode_clang=true ios_deployment_target="9.0" '
gn_extra = '--ide=xcode' gn_extra = '--ide=xcode'
if options.iphoneos: if options.iphoneos:
gn_args += ' target_cpu="arm64" ' gn_args += ' target_cpu="arm64" '
......
...@@ -100,6 +100,7 @@ def package_ios_framework_using_gn(out_dir='out/Framework', extra_options=''): ...@@ -100,6 +100,7 @@ def package_ios_framework_using_gn(out_dir='out/Framework', extra_options=''):
'is_cronet_build=true is_component_build=false ' \ 'is_cronet_build=true is_component_build=false ' \
'disable_file_support=true disable_ftp_support=true ' \ 'disable_file_support=true disable_ftp_support=true ' \
'include_transport_security_state_preload_list=false ' \ 'include_transport_security_state_preload_list=false ' \
'ios_deployment_target="9.0" ' \
'use_platform_icu_alternatives=true ' \ 'use_platform_icu_alternatives=true ' \
'disable_brotli_filter=false enable_dsyms=true ' \ 'disable_brotli_filter=false enable_dsyms=true ' \
'target_cpu="%s" additional_target_cpus = ["%s"] %s' % \ 'target_cpu="%s" additional_target_cpus = ["%s"] %s' % \
......
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
"enable_websockets=false", "enable_websockets=false",
"goma_dir=\"$(goma_dir)\"", "goma_dir=\"$(goma_dir)\"",
"include_transport_security_state_preload_list=false", "include_transport_security_state_preload_list=false",
"ios_deployment_target=\"9.0\"",
"is_component_build=false", "is_component_build=false",
"is_cronet_build=true", "is_cronet_build=true",
"is_debug=true", "is_debug=true",
......
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
"disable_ftp_support=true", "disable_ftp_support=true",
"enable_websockets=false", "enable_websockets=false",
"goma_dir=\"$(goma_dir)\"", "goma_dir=\"$(goma_dir)\"",
"ios_deployment_target=\"9.0\"",
"is_component_build=false", "is_component_build=false",
"is_cronet_build=true", "is_cronet_build=true",
"is_debug=true", "is_debug=true",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment