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

Unified Diff: webrtc/media/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 | « webrtc/common_video/BUILD.gn ('k') | webrtc/modules/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/media/BUILD.gn
diff --git a/webrtc/media/BUILD.gn b/webrtc/media/BUILD.gn
index 5545aef066602a62486482179f094c0375406d72..b593e998724225566960607b8a88f86ca4e21041 100644
--- a/webrtc/media/BUILD.gn
+++ b/webrtc/media/BUILD.gn
@@ -278,17 +278,15 @@ if (rtc_include_tests) {
}
}
- if (is_android || is_ios) {
- rtc_media_unittests_resources = [
- "//resources/media/captured-320x240-2s-48.frames",
- "//resources/media/faces.1280x720_P420.yuv",
- "//resources/media/faces_I420.jpg",
- "//resources/media/faces_I422.jpg",
- "//resources/media/faces_I444.jpg",
- "//resources/media/faces_I411.jpg",
- "//resources/media/faces_I400.jpg",
- ]
- }
+ rtc_media_unittests_resources = [
+ "//resources/media/captured-320x240-2s-48.frames",
+ "//resources/media/faces.1280x720_P420.yuv",
+ "//resources/media/faces_I420.jpg",
+ "//resources/media/faces_I422.jpg",
+ "//resources/media/faces_I444.jpg",
+ "//resources/media/faces_I411.jpg",
+ "//resources/media/faces_I400.jpg",
+ ]
if (is_ios) {
bundle_data("rtc_media_unittests_bundle_data") {
@@ -351,9 +349,10 @@ if (rtc_include_tests) {
]
}
+ data = rtc_media_unittests_resources
+
if (is_android) {
deps += [ "//testing/android/native_test:native_test_support" ]
- data = rtc_media_unittests_resources
shard_timeout = 900
}
« no previous file with comments | « webrtc/common_video/BUILD.gn ('k') | webrtc/modules/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698