Chromium Code Reviews| Index: webrtc/api/BUILD.gn |
| diff --git a/webrtc/api/BUILD.gn b/webrtc/api/BUILD.gn |
| index 526e82c0946b0e880ce9622e7cb60fe236bb4f06..158453c91c38c52d61f1252958280fdfaa065f20 100644 |
| --- a/webrtc/api/BUILD.gn |
| +++ b/webrtc/api/BUILD.gn |
| @@ -399,4 +399,60 @@ if (rtc_include_tests) { |
| deps += [ "//testing/android/native_test:native_test_support" ] |
| } |
| } |
| + |
| + if (is_android) { |
| + android_apk("libjingle_peerconnection_android_unittest_apk") { |
|
sakal
2016/08/10 07:56:57
This target is not needed. There is no application
|
| + apk_name = "libjingle_peerconnection_android" |
| + android_manifest = "androidtests/AndroidManifest.xml" |
| + |
| + deps = [ |
| + ":libjingle_peerconnection_android_unittest_java", |
| + ":libjingle_peerconnection_android_unittest_resources", |
| + "//base:base_java", |
| + "//webrtc/base:base_java", |
| + ] |
| + |
| + shared_libraries = [ ":libjingle_peerconnection_so" ] |
| + } |
| + |
| + android_library("libjingle_peerconnection_android_unittest_java") { |
|
sakal
2016/08/10 07:56:57
This is not needed either. I created it for AppRTC
|
| + java_files = [ |
| + "androidtests/src/org/webrtc/Camera1CapturerUsingByteBufferTest.java", |
| + "androidtests/src/org/webrtc/Camera1CapturerUsingTextureTest.java", |
| + "androidtests/src/org/webrtc/Camera2CapturerTest.java", |
| + "androidtests/src/org/webrtc/CameraVideoCapturerTestFixtures.java", |
| + "androidtests/src/org/webrtc/GlRectDrawerTest.java", |
| + "androidtests/src/org/webrtc/MediaCodecVideoEncoderTest.java", |
| + "androidtests/src/org/webrtc/NetworkMonitorTest.java", |
| + "androidtests/src/org/webrtc/RendererCommonTest.java", |
| + "androidtests/src/org/webrtc/SurfaceTextureHelperTest.java", |
| + "androidtests/src/org/webrtc/SurfaceViewRendererOnMeasureTest.java", |
| + ] |
| + |
| + deps = [ |
| + ":libjingle_peerconnection_android_unittest_resources", |
| + ":libjingle_peerconnection_java", |
| + "//webrtc/base:base_java", |
| + ] |
| + } |
| + |
| + android_resources("libjingle_peerconnection_android_unittest_resources") { |
|
sakal
2016/08/10 07:56:57
I would move this target below libjingle_peerconne
|
| + resource_dirs = [ "androidtests/res" ] |
| + custom_package = "org.webrtc" |
|
sakal
2016/08/10 07:56:57
This should be "org.webrtc.test". Resources are fo
|
| + } |
| + |
| + instrumentation_test_apk("libjingle_peerconnection_android_unittest") { |
| + apk_name = "libjingle_peerconnection_android_unittest" |
| + android_manifest = "androidtests/AndroidManifest.xml" |
| + |
| + java_files = [ "androidtests/src/org/webrtc/PeerConnectionTest.java" ] |
|
sakal
2016/08/10 07:56:57
Add rest of the java files here.
|
| + |
| + 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
|
| + |
| + deps = [ |
| + ":libjingle_peerconnection_android_unittest_java", |
|
sakal
2016/08/10 07:56:57
Remove this dependency and add "//base:base_java",
|
| + ":libjingle_peerconnection_java", |
| + ] |
|
sakal
2016/08/10 07:56:57
Add: shared_libraries = [ ":libjingle_peerconnecti
|
| + } |
| + } |
| } |