admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix 'iOS API Framework Builder'.

Browse Source 
When building WebRTC.framework, building the XCTest test runner is a
problem because it requires Chromium's //base checkout. This workaround
allows to skip that.

No-Presubmit: True
Bug: webrtc:12134
Change-Id: I0d99bd03f27911f46679ee91b0120e7121d1c7d7
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/196081
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Jeremy Leconte <jleconte@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#32732}
This commit is contained in:
Mirko Bonadei 2020-12-01 10:54:40 +01:00 committed by Commit Bot
parent f8aed2fb9f
commit 58678a0eb7
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tools_webrtc/ios/build_ios_libs.py
View File

@ -124,7 +124,8 @@ def BuildWebRTC(output_dir, target_arch, flavor, gn_target_name,
output_dir = os.path.join(output_dir, target_arch + '_libs') output_dir = os.path.join(output_dir, target_arch + '_libs')
gn_args = [ gn_args = [
'target_os="ios"', 'ios_enable_code_signing=false', 'target_os="ios"', 'ios_enable_code_signing=false',
'use_xcode_clang=true', 'is_component_build=false' 'use_xcode_clang=true', 'is_component_build=false',
'rtc_include_tests=false',
] ]
# Add flavor option. # Add flavor option.

2
webrtc.gni
View File

@ -466,7 +466,7 @@ template("rtc_test") {
# When not targeting a simulator, building //base/test:google_test_runner # When not targeting a simulator, building //base/test:google_test_runner
# fails, so it is added only when the test is not a real XCTest and when # fails, so it is added only when the test is not a real XCTest and when
# targeting a simulator. # targeting a simulator.
if (is_ios && target_cpu == "x64") { if (is_ios && target_cpu == "x64" && rtc_include_tests) {
if (!defined(invoker.is_xctest) || !invoker.is_xctest) { if (!defined(invoker.is_xctest) || !invoker.is_xctest) {
xctest_module_target = "//base/test:google_test_runner" xctest_module_target = "//base/test:google_test_runner"
} }