From b8ba8c9248ed92ac15b585e24c02ec9e21432ef0 Mon Sep 17 00:00:00 2001 From: Jeremy Leconte Date: Tue, 15 Mar 2022 09:08:29 +0100 Subject: [PATCH] Build //base/test:google_test_runner for iOS device. It seems the build failure is fixed and it is required so that "testRunGoogleTests" would be invoked as a "xctest". Bug: b/223364112 Change-Id: I2572af62d14c71e31b751c73a76e9f6e5d064ea8 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/254682 Reviewed-by: Mirko Bonadei Commit-Queue: Jeremy Leconte Cr-Commit-Position: refs/heads/main@{#36202} --- webrtc.gni | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/webrtc.gni b/webrtc.gni index 8040f628d9..b81f1605b2 100644 --- a/webrtc.gni +++ b/webrtc.gni @@ -498,10 +498,8 @@ 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" && rtc_include_tests) { + # Build //base/test:google_test_runner when the test is not a real XCTest. + if (is_ios && rtc_include_tests) { if (!defined(invoker.is_xctest) || !invoker.is_xctest) { xctest_module_target = "//base/test:google_test_runner" } @@ -530,6 +528,7 @@ template("rtc_test") { [ "//third_party/llvm-build/Release+Asserts/lib/libstdc++.so.6" ] } } + # TODO(crbug.com/webrtc/13556): Adding the .app folder in the runtime_deps # shoulnd't be necessary. this code should be removed and the same solution # as Chromium should be used.