Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. | 1 # Copyright (c) 2014 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 154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 165 # TODO(kjellander): Bug 261: fix this warning. | 165 # TODO(kjellander): Bug 261: fix this warning. |
| 166 "/wd4373", # Virtual function override. | 166 "/wd4373", # Virtual function override. |
| 167 ] | 167 ] |
| 168 } | 168 } |
| 169 | 169 |
| 170 if (is_clang) { | 170 if (is_clang) { |
| 171 # Suppress warnings from Chrome's Clang plugins. | 171 # Suppress warnings from Chrome's Clang plugins. |
| 172 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. | 172 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. |
| 173 configs -= [ "//build/config/clang:find_bad_constructs" ] | 173 configs -= [ "//build/config/clang:find_bad_constructs" ] |
| 174 } | 174 } |
| 175 | |
| 176 if (is_android) { | |
| 177 shard_timeout = 900 | |
|
kjellander_webrtc
2016/08/15 06:55:08
--> line 146.
sakal
2016/08/15 07:44:54
Done.
| |
| 178 } | |
| 175 } | 179 } |
| 176 | 180 |
| 177 if (!is_ios) { | 181 if (!is_ios) { |
| 178 executable("voe_auto_test") { | 182 executable("voe_auto_test") { |
| 179 testonly = true | 183 testonly = true |
| 180 | 184 |
| 181 deps = [ | 185 deps = [ |
| 182 ":voice_engine", | 186 ":voice_engine", |
| 183 "//testing/gmock", | 187 "//testing/gmock", |
| 184 "//testing/gtest", | 188 "//testing/gtest", |
| (...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 261 } | 265 } |
| 262 | 266 |
| 263 if (is_clang) { | 267 if (is_clang) { |
| 264 # Suppress warnings from Chrome's Clang plugins. | 268 # Suppress warnings from Chrome's Clang plugins. |
| 265 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. | 269 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. |
| 266 configs -= [ "//build/config/clang:find_bad_constructs" ] | 270 configs -= [ "//build/config/clang:find_bad_constructs" ] |
| 267 } | 271 } |
| 268 } | 272 } |
| 269 } | 273 } |
| 270 } | 274 } |
| OLD | NEW |