From 58678a0eb7a35d2b7f75770d1d04fdd0684ab55c Mon Sep 17 00:00:00 2001 From: Mirko Bonadei Date: Tue, 1 Dec 2020 10:54:40 +0100 Subject: [PATCH] Fix 'iOS API Framework Builder'. 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 Reviewed-by: Jeremy Leconte Cr-Commit-Position: refs/heads/master@{#32732} --- tools_webrtc/ios/build_ios_libs.py | 3 ++- webrtc.gni | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tools_webrtc/ios/build_ios_libs.py b/tools_webrtc/ios/build_ios_libs.py index 383338382b..1971c3e07e 100755 --- a/tools_webrtc/ios/build_ios_libs.py +++ b/tools_webrtc/ios/build_ios_libs.py @@ -124,7 +124,8 @@ def BuildWebRTC(output_dir, target_arch, flavor, gn_target_name, output_dir = os.path.join(output_dir, target_arch + '_libs') gn_args = [ '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. diff --git a/webrtc.gni b/webrtc.gni index 0e3a585ad4..c4530dd684 100644 --- a/webrtc.gni +++ b/webrtc.gni @@ -466,7 +466,7 @@ template("rtc_test") { # 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 # 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) { xctest_module_target = "//base/test:google_test_runner" }