Chromium Code Reviews| Index: webrtc/BUILD.gn |
| diff --git a/webrtc/BUILD.gn b/webrtc/BUILD.gn |
| index 94ce0120b61e73b84d076c385625bc51fcc17862..04128aff6747db88a350c4a5beed348c559c483b 100644 |
| --- a/webrtc/BUILD.gn |
| +++ b/webrtc/BUILD.gn |
| @@ -602,6 +602,10 @@ if (rtc_include_tests) { |
| # https://developer.apple.com/library/mac/qa/qa1490/_index.html |
| ldflags = [ "-ObjC" ] |
| } |
| + |
| + if (is_android) { |
| + shard_timeout = 900 |
|
kjellander_webrtc
2016/08/15 06:55:08
Please put this at line 581 instead.
sakal
2016/08/15 07:44:54
Done.
|
| + } |
| } |
| test("xmllite_xmpp_unittests") { |
| @@ -665,6 +669,10 @@ if (rtc_include_tests) { |
| # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. |
| configs -= [ "//build/config/clang:find_bad_constructs" ] |
| } |
| + |
| + if (is_android) { |
| + shard_timeout = 900 |
|
kjellander_webrtc
2016/08/15 06:55:08
Hmm, this test was added in https://codereview.web
sakal
2016/08/15 07:44:54
Acknowledged.
|
| + } |
| } |
| source_set("video_quality_test") { |
| @@ -731,6 +739,9 @@ if (rtc_include_tests) { |
| # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. |
| configs -= [ "//build/config/clang:find_bad_constructs" ] |
| } |
| + if (is_android) { |
| + shard_timeout = 2700 |
|
kjellander_webrtc
2016/08/15 06:55:08
Please move to line 736.
sakal
2016/08/15 07:44:54
Done.
|
| + } |
| } |
| test("webrtc_nonparallel_tests") { |
| @@ -771,5 +782,8 @@ if (rtc_include_tests) { |
| # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. |
| configs -= [ "//build/config/clang:find_bad_constructs" ] |
| } |
| + if (is_android) { |
| + shard_timeout = 900 |
|
kjellander_webrtc
2016/08/15 06:55:08
Please move to line 772.
sakal
2016/08/15 07:44:54
Done.
|
| + } |
| } |
| } |