Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 if (is_android) { | 10 if (is_android) { |
| (...skipping 432 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 443 ":libjingle_peerconnection_jni", | 443 ":libjingle_peerconnection_jni", |
| 444 "//testing/android/native_test:native_test_support", | 444 "//testing/android/native_test:native_test_support", |
| 445 ] | 445 ] |
| 446 } | 446 } |
| 447 | 447 |
| 448 deps += [ | 448 deps += [ |
| 449 ":libjingle_peerconnection", | 449 ":libjingle_peerconnection", |
| 450 "..:webrtc_common", | 450 "..:webrtc_common", |
| 451 "../base:rtc_base_tests_utils", | 451 "../base:rtc_base_tests_utils", |
| 452 "../media:rtc_unittest_main", | 452 "../media:rtc_unittest_main", |
| 453 "../modules/video_capture:video_capture", | |
|
nisse-webrtc
2016/11/18 11:17:45
I don't understand why this becomes needed now. Wi
kjellander_webrtc
2016/11/18 13:52:40
It's because of test_common. See https://cs.chromi
| |
| 453 "../pc:rtc_pc", | 454 "../pc:rtc_pc", |
| 454 "../system_wrappers:metrics_default", | 455 "../system_wrappers:metrics_default", |
| 456 "../test:test_common", | |
|
nisse-webrtc
2016/11/18 11:17:45
And this is to get FirewallSocketServer.
| |
| 455 "//testing/gmock", | 457 "//testing/gmock", |
| 456 ] | 458 ] |
| 457 | 459 |
| 458 if (is_android) { | 460 if (is_android) { |
| 459 deps += [ "//testing/android/native_test:native_test_support" ] | 461 deps += [ "//testing/android/native_test:native_test_support" ] |
| 460 | 462 |
| 461 shard_timeout = 900 | 463 shard_timeout = 900 |
| 462 } | 464 } |
| 463 } | 465 } |
| 464 | 466 |
| (...skipping 21 matching lines...) Expand all Loading... | |
| 486 deps = [ | 488 deps = [ |
| 487 ":libjingle_peerconnection_java", | 489 ":libjingle_peerconnection_java", |
| 488 "../base:base_java", | 490 "../base:base_java", |
| 489 "//base:base_java", | 491 "//base:base_java", |
| 490 ] | 492 ] |
| 491 | 493 |
| 492 shared_libraries = [ ":libjingle_peerconnection_so" ] | 494 shared_libraries = [ ":libjingle_peerconnection_so" ] |
| 493 } | 495 } |
| 494 } | 496 } |
| 495 } | 497 } |
| OLD | NEW |