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 import("//testing/test.gni") | 10 import("//testing/test.gni") |
| (...skipping 381 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 392 "../media:rtc_unittest_main", | 392 "../media:rtc_unittest_main", |
| 393 "../pc:rtc_pc", | 393 "../pc:rtc_pc", |
| 394 "../system_wrappers:metrics_default", | 394 "../system_wrappers:metrics_default", |
| 395 "//testing/gmock", | 395 "//testing/gmock", |
| 396 ] | 396 ] |
| 397 | 397 |
| 398 if (is_android) { | 398 if (is_android) { |
| 399 deps += [ "//testing/android/native_test:native_test_support" ] | 399 deps += [ "//testing/android/native_test:native_test_support" ] |
| 400 } | 400 } |
| 401 } | 401 } |
| 402 | |
| 403 if (is_android) { | |
| 404 android_apk("libjingle_peerconnection_android_unittest_apk") { | |
|
sakal
2016/08/10 07:56:57
This target is not needed. There is no application
| |
| 405 apk_name = "libjingle_peerconnection_android" | |
| 406 android_manifest = "androidtests/AndroidManifest.xml" | |
| 407 | |
| 408 deps = [ | |
| 409 ":libjingle_peerconnection_android_unittest_java", | |
| 410 ":libjingle_peerconnection_android_unittest_resources", | |
| 411 "//base:base_java", | |
| 412 "//webrtc/base:base_java", | |
| 413 ] | |
| 414 | |
| 415 shared_libraries = [ ":libjingle_peerconnection_so" ] | |
| 416 } | |
| 417 | |
| 418 android_library("libjingle_peerconnection_android_unittest_java") { | |
|
sakal
2016/08/10 07:56:57
This is not needed either. I created it for AppRTC
| |
| 419 java_files = [ | |
| 420 "androidtests/src/org/webrtc/Camera1CapturerUsingByteBufferTest.java", | |
| 421 "androidtests/src/org/webrtc/Camera1CapturerUsingTextureTest.java", | |
| 422 "androidtests/src/org/webrtc/Camera2CapturerTest.java", | |
| 423 "androidtests/src/org/webrtc/CameraVideoCapturerTestFixtures.java", | |
| 424 "androidtests/src/org/webrtc/GlRectDrawerTest.java", | |
| 425 "androidtests/src/org/webrtc/MediaCodecVideoEncoderTest.java", | |
| 426 "androidtests/src/org/webrtc/NetworkMonitorTest.java", | |
| 427 "androidtests/src/org/webrtc/RendererCommonTest.java", | |
| 428 "androidtests/src/org/webrtc/SurfaceTextureHelperTest.java", | |
| 429 "androidtests/src/org/webrtc/SurfaceViewRendererOnMeasureTest.java", | |
| 430 ] | |
| 431 | |
| 432 deps = [ | |
| 433 ":libjingle_peerconnection_android_unittest_resources", | |
| 434 ":libjingle_peerconnection_java", | |
| 435 "//webrtc/base:base_java", | |
| 436 ] | |
| 437 } | |
| 438 | |
| 439 android_resources("libjingle_peerconnection_android_unittest_resources") { | |
|
sakal
2016/08/10 07:56:57
I would move this target below libjingle_peerconne
| |
| 440 resource_dirs = [ "androidtests/res" ] | |
| 441 custom_package = "org.webrtc" | |
|
sakal
2016/08/10 07:56:57
This should be "org.webrtc.test". Resources are fo
| |
| 442 } | |
| 443 | |
| 444 instrumentation_test_apk("libjingle_peerconnection_android_unittest") { | |
| 445 apk_name = "libjingle_peerconnection_android_unittest" | |
| 446 android_manifest = "androidtests/AndroidManifest.xml" | |
| 447 | |
| 448 java_files = [ "androidtests/src/org/webrtc/PeerConnectionTest.java" ] | |
|
sakal
2016/08/10 07:56:57
Add rest of the java files here.
| |
| 449 | |
| 450 apk_under_test = ":libjingle_peerconnection_android_unittest_apk" | |
|
sakal
2016/08/10 07:56:57
This target does not test an apk. Please remove th
| |
| 451 | |
| 452 deps = [ | |
| 453 ":libjingle_peerconnection_android_unittest_java", | |
|
sakal
2016/08/10 07:56:57
Remove this dependency and add "//base:base_java",
| |
| 454 ":libjingle_peerconnection_java", | |
| 455 ] | |
|
sakal
2016/08/10 07:56:57
Add: shared_libraries = [ ":libjingle_peerconnecti
| |
| 456 } | |
| 457 } | |
| 402 } | 458 } |
| OLD | NEW |