| 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 # TODO(kjellander): Rebase this to webrtc/build/common.gypi changes after r6330. | 9 # TODO(kjellander): Rebase this to webrtc/build/common.gypi changes after r6330. |
| 10 | 10 |
| (...skipping 472 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 483 ] | 483 ] |
| 484 if (is_android) { | 484 if (is_android) { |
| 485 deps += [ "//testing/android/native_test:native_test_support" ] | 485 deps += [ "//testing/android/native_test:native_test_support" ] |
| 486 shard_timeout = 900 | 486 shard_timeout = 900 |
| 487 } | 487 } |
| 488 } | 488 } |
| 489 | 489 |
| 490 if (is_android) { | 490 if (is_android) { |
| 491 junit_binary("android_junit_tests") { | 491 junit_binary("android_junit_tests") { |
| 492 java_files = [ | 492 java_files = [ |
| 493 "androidjunit/src/org/webrtc/CameraEnumerationTest.java", | 493 "examples/androidjunit/src/org/appspot/apprtc/BluetoothManagerTest.java"
, |
| 494 "examples/androidjunit/src/org/appspot/apprtc/DirectRTCClientTest.java", | 494 "examples/androidjunit/src/org/appspot/apprtc/DirectRTCClientTest.java", |
| 495 "examples/androidjunit/src/org/appspot/apprtc/TCPChannelClientTest.java"
, | 495 "examples/androidjunit/src/org/appspot/apprtc/TCPChannelClientTest.java"
, |
| 496 "examples/androidjunit/src/org/appspot/apprtc/BluetoothManagerTest.java"
, | 496 "sdk/android/tests/src/org/webrtc/CameraEnumerationTest.java", |
| 497 ] | 497 ] |
| 498 | 498 |
| 499 deps = [ | 499 deps = [ |
| 500 "//base:base_java_test_support", | 500 "//base:base_java_test_support", |
| 501 "//webrtc/examples:AppRTCMobile_javalib", | 501 "//webrtc/examples:AppRTCMobile_javalib", |
| 502 "//webrtc/sdk/android:libjingle_peerconnection_java", | 502 "//webrtc/sdk/android:libjingle_peerconnection_java", |
| 503 ] | 503 ] |
| 504 } | 504 } |
| 505 } | 505 } |
| 506 } | 506 } |
| OLD | NEW |