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

Unified Diff: webrtc/media/BUILD.gn

Issue 2277753003: GN: Synchronize resources between Android and iOS. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Removed outdated comments Created 4 years, 4 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 a95ab23d9e1d60ff497334ef94132477ba4eeb7c..d0453c7db8076019835a7f9e81f6f5b6584d695c 100644
--- a/webrtc/media/BUILD.gn
+++ b/webrtc/media/BUILD.gn
@@ -340,9 +340,9 @@ if (rtc_include_tests) {
if (is_android) {
deps += [ "//testing/android/native_test:native_test_support" ]
-
- # This needs to be kept in sync with the rtc_media_unittests.isolate file.
- # TODO(kjellander); Move this to android_assets targets instead.
+ shard_timeout = 900
+ }
+ if (is_android || is_ios) {
data = [
"//resources/media/captured-320x240-2s-48.frames",
"//resources/media/faces.1280x720_P420.yuv",
« 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