talk/app/webrtc/peerconnectionendtoend_unittest.cc - Issue 1511633002: Add APK targets to build libjingle tests for Android.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: talk/app/webrtc/peerconnectionendtoend_unittest.cc

Issue 1511633002: Add APK targets to build libjingle tests for Android. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: Reverted <gtest of libjingle_media_unittests and p2p. Created 5 years 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

« talk/app/webrtc/java/jni/jni_onload.cc ('K') | « talk/app/webrtc/java/jni/peerconnection_jni.cc ('k') | talk/app/webrtc/peerconnectionfactory_unittest.cc » ('j') | talk/app/webrtc/test/androidtestinitializer.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: talk/app/webrtc/peerconnectionendtoend_unittest.cc

diff --git a/talk/app/webrtc/peerconnectionendtoend_unittest.cc b/talk/app/webrtc/peerconnectionendtoend_unittest.cc

index aff117e1bbb776924ecc679ebf6a9def985c3a24..1981edd200d7716bd23882eb1ed9e1e6f67e9595 100644

--- a/talk/app/webrtc/peerconnectionendtoend_unittest.cc

+++ b/talk/app/webrtc/peerconnectionendtoend_unittest.cc

@@ -27,6 +27,9 @@

#include "talk/app/webrtc/test/peerconnectiontestwrapper.h"

#include "talk/app/webrtc/test/mockpeerconnectionobservers.h"

+#ifdef WEBRTC_ANDROID

+#include "talk/app/webrtc/test/androidtestinitializer.h"

+#endif

#include "webrtc/base/gunit.h"

#include "webrtc/base/logging.h"

#include "webrtc/base/ssladapter.h"

@@ -114,6 +117,9 @@ class PeerConnectionEndToEndTest

"caller")),

callee_(new rtc::RefCountedObject<PeerConnectionTestWrapper>(

"callee")) {

+#ifdef WEBRTC_ANDROID

+ webrtc::InitializeAndroidObjects();

+#endif

}

void CreatePcs() {