From 8ed61858c3ef0e776fab9c6f887d49c7935e3925 Mon Sep 17 00:00:00 2001 From: Mirko Bonadei Date: Sat, 16 Jan 2021 10:39:20 +0100 Subject: [PATCH] Move iOS bundle data for tests inside rtc_include_test. This should fix issues like [1] which surfaced after landing [2] which is not the direct cause though. [1] - https://ci.chromium.org/ui/p/chromium/builders/webrtc.fyi/WebRTC%20Chromium%20FYI%20ios-device/8133/overview [2] - https://webrtc-review.googlesource.com/c/src/+/200981 TBR=landrey@webrtc.org Bug: None Change-Id: Id222bf0df109711a4aaba708786b8f623e50b9f6 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/202037 Reviewed-by: Mirko Bonadei Commit-Queue: Mirko Bonadei Cr-Commit-Position: refs/heads/master@{#33008} --- test/scenario/BUILD.gn | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/test/scenario/BUILD.gn b/test/scenario/BUILD.gn index a6e3ed9dd2..b17f722bcb 100644 --- a/test/scenario/BUILD.gn +++ b/test/scenario/BUILD.gn @@ -31,19 +31,20 @@ if (is_ios || rtc_include_tests) { scenario_unittest_resources = [ "../../resources/foreman_cif.yuv" ] } -if (is_ios) { - bundle_data("scenario_resources_bundle_data") { - testonly = true - sources = scenario_resources - outputs = [ "{{bundle_resources_dir}}/{{source_file_part}}" ] - } - bundle_data("scenario_unittest_resources_bundle_data") { - testonly = true - sources = scenario_unittest_resources - outputs = [ "{{bundle_resources_dir}}/{{source_file_part}}" ] - } -} if (rtc_include_tests) { + if (is_ios) { + bundle_data("scenario_resources_bundle_data") { + testonly = true + sources = scenario_resources + outputs = [ "{{bundle_resources_dir}}/{{source_file_part}}" ] + } + bundle_data("scenario_unittest_resources_bundle_data") { + testonly = true + sources = scenario_unittest_resources + outputs = [ "{{bundle_resources_dir}}/{{source_file_part}}" ] + } + } + rtc_library("scenario") { testonly = true sources = [