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

Side by Side Diff: webrtc/api/BUILD.gn

Issue 2231413002: GN: Update tests to have the correct shard timeout value on Android. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Fixes according to 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 unified diff | Download patch
« no previous file with comments | « webrtc/BUILD.gn ('k') | webrtc/common_audio/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2015 The WebRTC project authors. All Rights Reserved. 1 # Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
2 # 2 #
3 # Use of this source code is governed by a BSD-style license 3 # Use of this source code is governed by a BSD-style license
4 # that can be found in the LICENSE file in the root of the source 4 # that can be found in the LICENSE file in the root of the source
5 # tree. An additional intellectual property rights grant can be found 5 # tree. An additional intellectual property rights grant can be found
6 # in the file PATENTS. All contributing project authors may 6 # in the file PATENTS. All contributing project authors may
7 # be found in the AUTHORS file in the root of the source tree. 7 # be found in the AUTHORS file in the root of the source tree.
8 8
9 import("../build/webrtc.gni") 9 import("../build/webrtc.gni")
10 import("//testing/test.gni") 10 import("//testing/test.gni")
(...skipping 382 matching lines...) Expand 10 before | Expand all | Expand 10 after
393 "..:webrtc_common", 393 "..:webrtc_common",
394 "../base:rtc_base_tests_utils", 394 "../base:rtc_base_tests_utils",
395 "../media:rtc_unittest_main", 395 "../media:rtc_unittest_main",
396 "../pc:rtc_pc", 396 "../pc:rtc_pc",
397 "../system_wrappers:metrics_default", 397 "../system_wrappers:metrics_default",
398 "//testing/gmock", 398 "//testing/gmock",
399 ] 399 ]
400 400
401 if (is_android) { 401 if (is_android) {
402 deps += [ "//testing/android/native_test:native_test_support" ] 402 deps += [ "//testing/android/native_test:native_test_support" ]
403
404 shard_timeout = 900
403 } 405 }
404 } 406 }
405 407
406 if (is_android) { 408 if (is_android) {
407 instrumentation_test_apk("libjingle_peerconnection_android_unittest") { 409 instrumentation_test_apk("libjingle_peerconnection_android_unittest") {
408 apk_name = "libjingle_peerconnection_android_unittest" 410 apk_name = "libjingle_peerconnection_android_unittest"
409 android_manifest = "androidtests/AndroidManifest.xml" 411 android_manifest = "androidtests/AndroidManifest.xml"
410 412
411 java_files = [ 413 java_files = [
412 "androidtests/src/org/webrtc/Camera1CapturerUsingByteBufferTest.java", 414 "androidtests/src/org/webrtc/Camera1CapturerUsingByteBufferTest.java",
(...skipping 18 matching lines...) Expand all
431 433
432 shared_libraries = [ ":libjingle_peerconnection_so" ] 434 shared_libraries = [ ":libjingle_peerconnection_so" ]
433 } 435 }
434 436
435 android_resources("libjingle_peerconnection_android_unittest_resources") { 437 android_resources("libjingle_peerconnection_android_unittest_resources") {
436 resource_dirs = [ "androidtests/res" ] 438 resource_dirs = [ "androidtests/res" ]
437 custom_package = "org.webrtc" 439 custom_package = "org.webrtc"
438 } 440 }
439 } 441 }
440 } 442 }
OLDNEW
« no previous file with comments | « webrtc/BUILD.gn ('k') | webrtc/common_audio/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698