Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(330)

Unified Diff: webrtc/api/BUILD.gn

Issue 2226093003: Add libjingle_peerconnection_unittest to GN targets. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/api/BUILD.gn
diff --git a/webrtc/api/BUILD.gn b/webrtc/api/BUILD.gn
index 526e82c0946b0e880ce9622e7cb60fe236bb4f06..a69e27db88e30e3caf6e14783b93dc20d623211a 100644
--- a/webrtc/api/BUILD.gn
+++ b/webrtc/api/BUILD.gn
@@ -399,4 +399,62 @@ if (rtc_include_tests) {
deps += [ "//testing/android/native_test:native_test_support" ]
}
}
+
+ # The test below depends on libjingle_peerconnection_java which is excluded
+ # from the Chromium build, so it isn't built with Chromium either.
+ if (is_android && !build_with_chromium) {
kjellander_webrtc 2016/08/09 11:10:16 Since you're inside the rtc_include_tests conditio
+ android_apk("libjingle_peerconnection_android_unittest_apk") {
+ apk_name = "libjingle_peerconnection_android"
+ android_manifest = "andreidtests/AndroidManifest.xml"
+
+ deps = [
+ ":libjingle_peerconnection_unittest_java",
kjellander_webrtc 2016/08/09 11:10:16 Change to :libjingle_peerconnection_android_unitte
+ ":libjingle_peerconnection_unittest_resources",
kjellander_webrtc 2016/08/09 11:10:16 :libjingle_peerconnection_android_unittest_resourc
+ "//base:base_java",
+ "//webrtc/base:base_java",
+ ]
+
+ shared_libraries = [ ":libjingle_peerconnection_so" ]
+ }
+
+ android_library("libjingle_peerconnection_android_unittest_java") {
+ 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_java",
+ ":libjingle_peerconnection_unittest_resources",
kjellander_webrtc 2016/08/09 11:10:16 :libjingle_peerconnection_android_unittest_resourc
+ "//webrtc/base:base_java",
+ ]
+ }
+
+ android_resources("libjingle_peerconnection_android_unittest_resources") {
+ resource_dirs = [ "androidtests/res" ]
+ custom_package = "org.webrtc"
+ }
+
+ 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" ]
+
+ apk_under_test = ":libjingle_peerconnection_android_unittest_apk"
+
+ deps = [
+ ":libjingle_peerconnection_java",
+ ":libjingle_peerconnection_unittest_java",
kjellander_webrtc 2016/08/09 11:10:16 :libjingle_peerconnection_android_unittest_java
+ ]
+ }
+ }
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698