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

Side by Side Diff: webrtc/modules/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: 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
OLDNEW
1 # Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. 1 # Copyright (c) 2016 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("audio_coding/audio_coding.gni") 10 import("audio_coding/audio_coding.gni")
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 configs -= [ "//build/config/clang:find_bad_constructs" ] 99 configs -= [ "//build/config/clang:find_bad_constructs" ]
100 } 100 }
101 if (is_win) { 101 if (is_win) {
102 cflags = [ 102 cflags = [
103 # TODO(phoglund): get rid of 4373 supression when 103 # TODO(phoglund): get rid of 4373 supression when
104 # http://code.google.com/p/webrtc/issues/detail?id=261 is solved. 104 # http://code.google.com/p/webrtc/issues/detail?id=261 is solved.
105 # legacy warning for ignoring const / volatile in signatures. 105 # legacy warning for ignoring const / volatile in signatures.
106 "/wd4373", 106 "/wd4373",
107 ] 107 ]
108 } 108 }
109
110 if (is_android) {
111 shard_timeout = 900
kjellander_webrtc 2016/08/15 06:55:08 Move to line 87.
sakal 2016/08/15 07:44:54 Done.
112 }
109 } 113 }
110 114
111 test("modules_unittests") { 115 test("modules_unittests") {
112 testonly = true 116 testonly = true
113 117
114 defines = audio_coding_defines 118 defines = audio_coding_defines
115 deps = [] 119 deps = []
116 sources = [ 120 sources = [
117 "audio_coding/acm2/acm_receiver_unittest_oldapi.cc", 121 "audio_coding/acm2/acm_receiver_unittest_oldapi.cc",
118 "audio_coding/acm2/audio_coding_module_unittest_oldapi.cc", 122 "audio_coding/acm2/audio_coding_module_unittest_oldapi.cc",
(...skipping 475 matching lines...) Expand 10 before | Expand all | Expand 10 after
594 "//resources/synthetic-trace.rx", 598 "//resources/synthetic-trace.rx",
595 "//resources/tmobile-downlink.rx", 599 "//resources/tmobile-downlink.rx",
596 "//resources/tmobile-uplink.rx", 600 "//resources/tmobile-uplink.rx",
597 "//resources/utility/encapsulated_pcm16b_8khz.wav", 601 "//resources/utility/encapsulated_pcm16b_8khz.wav",
598 "//resources/utility/encapsulated_pcmu_8khz.wav", 602 "//resources/utility/encapsulated_pcmu_8khz.wav",
599 "//resources/verizon3g-downlink.rx", 603 "//resources/verizon3g-downlink.rx",
600 "//resources/verizon3g-uplink.rx", 604 "//resources/verizon3g-uplink.rx",
601 "//resources/verizon4g-downlink.rx", 605 "//resources/verizon4g-downlink.rx",
602 "//resources/verizon4g-uplink.rx", 606 "//resources/verizon4g-uplink.rx",
603 ] 607 ]
608
609 shard_timeout = 900
604 } 610 }
605 611
606 if (is_ios) { 612 if (is_ios) {
607 configs += [ 613 configs += [
608 "..:common_objc", 614 "..:common_objc",
609 "//build/config/compiler:enable_arc", 615 "//build/config/compiler:enable_arc",
610 ] 616 ]
611 617
612 sources += [ 618 sources += [
613 "audio_device/ios/audio_device_unittest_ios.cc", 619 "audio_device/ios/audio_device_unittest_ios.cc",
614 "audio_device/ios/objc/RTCAudioSessionTest.mm", 620 "audio_device/ios/objc/RTCAudioSessionTest.mm",
615 "video_coding/codecs/h264/h264_video_toolbox_nalu_unittest.cc", 621 "video_coding/codecs/h264/h264_video_toolbox_nalu_unittest.cc",
616 ] 622 ]
617 623
618 ldflags = [ "-ObjC" ] 624 ldflags = [ "-ObjC" ]
619 625
620 # TODO(kjellander): Mac bundle files. 626 # TODO(kjellander): Mac bundle files.
621 } 627 }
622 } 628 }
623 } 629 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698