Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1231)

Unified Diff: webrtc/BUILD.gn

Issue 2340753002: GN: Declare resources for targets. (Closed)
Patch Set: Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | webrtc/common_video/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/BUILD.gn
diff --git a/webrtc/BUILD.gn b/webrtc/BUILD.gn
index 2d722c91259ef29abcdcd8584619ce0a748c17a5..88c4e09c72af1cb5e9d56fb3651888a31d32c6c3 100644
--- a/webrtc/BUILD.gn
+++ b/webrtc/BUILD.gn
@@ -618,12 +618,10 @@ if (rtc_include_tests) {
}
# TODO(pbos): Rename test suite, this is no longer "just" for video targets.
- if (is_android || is_ios) {
- video_engine_tests_resources = [
- "//resources/foreman_cif_short.yuv",
- "//resources/voice_engine/audio_long16.pcm",
- ]
- }
+ video_engine_tests_resources = [
+ "//resources/foreman_cif_short.yuv",
+ "//resources/voice_engine/audio_long16.pcm",
+ ]
if (is_ios) {
bundle_data("video_engine_tests_bundle_data") {
@@ -645,6 +643,7 @@ if (rtc_include_tests) {
"test:test_main",
"video:video_tests",
]
+ data = video_engine_tests_resources
if (is_clang) {
# Suppress warnings from the Chromium Clang plugin.
# See http://code.google.com/p/webrtc/issues/detail?id=163 for details.
@@ -652,7 +651,6 @@ if (rtc_include_tests) {
}
if (is_android) {
deps += [ "//testing/android/native_test:native_test_native_code" ]
- data = video_engine_tests_resources
shard_timeout = 900
}
@@ -682,22 +680,20 @@ if (rtc_include_tests) {
}
}
- if (is_android || is_ios) {
- webrtc_perf_tests_resources = [
- "//resources/audio_coding/speech_mono_16kHz.pcm",
- "//resources/audio_coding/testfile32kHz.pcm",
- "//resources/ConferenceMotion_1280_720_50.yuv",
- "//resources/difficult_photo_1850_1110.yuv",
- "//resources/foreman_cif.yuv",
- "//resources/google-wifi-3mbps.rx",
- "//resources/paris_qcif.yuv",
- "//resources/photo_1850_1110.yuv",
- "//resources/presentation_1850_1110.yuv",
- "//resources/verizon4g-downlink.rx",
- "//resources/voice_engine/audio_long16.pcm",
- "//resources/web_screenshot_1850_1110.yuv",
- ]
- }
+ webrtc_perf_tests_resources = [
+ "//resources/audio_coding/speech_mono_16kHz.pcm",
+ "//resources/audio_coding/testfile32kHz.pcm",
+ "//resources/ConferenceMotion_1280_720_50.yuv",
+ "//resources/difficult_photo_1850_1110.yuv",
+ "//resources/foreman_cif.yuv",
+ "//resources/google-wifi-3mbps.rx",
+ "//resources/paris_qcif.yuv",
+ "//resources/photo_1850_1110.yuv",
+ "//resources/presentation_1850_1110.yuv",
+ "//resources/verizon4g-downlink.rx",
+ "//resources/voice_engine/audio_long16.pcm",
+ "//resources/web_screenshot_1850_1110.yuv",
+ ]
if (is_ios) {
bundle_data("webrtc_perf_tests_bundle_data") {
@@ -783,9 +779,9 @@ if (rtc_include_tests) {
defines = [ "WEBRTC_INTELLIGIBILITY_ENHANCER=0" ]
}
+ data = webrtc_perf_tests_resources
if (is_android) {
deps += [ "//testing/android/native_test:native_test_native_code" ]
- data = webrtc_perf_tests_resources
shard_timeout = 2700
}
if (is_ios) {
« no previous file with comments | « no previous file | webrtc/common_video/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698