| Index: talk/app/webrtc/java/jni/classreferenceholder.cc
|
| diff --git a/talk/app/webrtc/java/jni/classreferenceholder.cc b/talk/app/webrtc/java/jni/classreferenceholder.cc
|
| index a7d36c226fc7321e50e5018d24e42db92aec4376..0d52bc5122e39a591f91519319977cf5e5428474 100644
|
| --- a/talk/app/webrtc/java/jni/classreferenceholder.cc
|
| +++ b/talk/app/webrtc/java/jni/classreferenceholder.cc
|
| @@ -62,28 +62,21 @@ void FreeGlobalClassReferenceHolder() {
|
| }
|
|
|
| ClassReferenceHolder::ClassReferenceHolder(JNIEnv* jni) {
|
| + LoadClass(jni, "android/graphics/SurfaceTexture");
|
| LoadClass(jni, "java/nio/ByteBuffer");
|
| LoadClass(jni, "java/util/ArrayList");
|
| LoadClass(jni, "org/webrtc/AudioTrack");
|
| + LoadClass(jni, "org/webrtc/CameraEnumerator");
|
| + LoadClass(jni, "org/webrtc/Camera2Enumerator");
|
| + LoadClass(jni, "org/webrtc/CameraEnumerationAndroid");
|
| LoadClass(jni, "org/webrtc/DataChannel");
|
| LoadClass(jni, "org/webrtc/DataChannel$Buffer");
|
| LoadClass(jni, "org/webrtc/DataChannel$Init");
|
| LoadClass(jni, "org/webrtc/DataChannel$State");
|
| - LoadClass(jni, "org/webrtc/IceCandidate");
|
| -#if defined(ANDROID) && !defined(WEBRTC_CHROMIUM_BUILD)
|
| - LoadClass(jni, "android/graphics/SurfaceTexture");
|
| - LoadClass(jni, "org/webrtc/CameraEnumerator");
|
| - LoadClass(jni, "org/webrtc/Camera2Enumerator");
|
| - LoadClass(jni, "org/webrtc/CameraEnumerationAndroid");
|
| - LoadClass(jni, "org/webrtc/VideoCapturerAndroid");
|
| - LoadClass(jni, "org/webrtc/VideoCapturerAndroid$NativeObserver");
|
| LoadClass(jni, "org/webrtc/EglBase");
|
| LoadClass(jni, "org/webrtc/EglBase$Context");
|
| LoadClass(jni, "org/webrtc/EglBase14$Context");
|
| - LoadClass(jni, "org/webrtc/NetworkMonitor");
|
| - LoadClass(jni, "org/webrtc/NetworkMonitorAutoDetect$ConnectionType");
|
| - LoadClass(jni, "org/webrtc/NetworkMonitorAutoDetect$IPAddress");
|
| - LoadClass(jni, "org/webrtc/NetworkMonitorAutoDetect$NetworkInformation");
|
| + LoadClass(jni, "org/webrtc/IceCandidate");
|
| LoadClass(jni, "org/webrtc/MediaCodecVideoEncoder");
|
| LoadClass(jni, "org/webrtc/MediaCodecVideoEncoder$OutputBufferInfo");
|
| LoadClass(jni, "org/webrtc/MediaCodecVideoEncoder$VideoCodecType");
|
| @@ -91,11 +84,13 @@ ClassReferenceHolder::ClassReferenceHolder(JNIEnv* jni) {
|
| LoadClass(jni, "org/webrtc/MediaCodecVideoDecoder$DecodedTextureBuffer");
|
| LoadClass(jni, "org/webrtc/MediaCodecVideoDecoder$DecodedOutputBuffer");
|
| LoadClass(jni, "org/webrtc/MediaCodecVideoDecoder$VideoCodecType");
|
| - LoadClass(jni, "org/webrtc/SurfaceTextureHelper");
|
| -#endif
|
| LoadClass(jni, "org/webrtc/MediaSource$State");
|
| LoadClass(jni, "org/webrtc/MediaStream");
|
| LoadClass(jni, "org/webrtc/MediaStreamTrack$State");
|
| + LoadClass(jni, "org/webrtc/NetworkMonitor");
|
| + LoadClass(jni, "org/webrtc/NetworkMonitorAutoDetect$ConnectionType");
|
| + LoadClass(jni, "org/webrtc/NetworkMonitorAutoDetect$IPAddress");
|
| + LoadClass(jni, "org/webrtc/NetworkMonitorAutoDetect$NetworkInformation");
|
| LoadClass(jni, "org/webrtc/PeerConnectionFactory");
|
| LoadClass(jni, "org/webrtc/PeerConnection$BundlePolicy");
|
| LoadClass(jni, "org/webrtc/PeerConnection$ContinualGatheringPolicy");
|
| @@ -112,8 +107,10 @@ ClassReferenceHolder::ClassReferenceHolder(JNIEnv* jni) {
|
| LoadClass(jni, "org/webrtc/SessionDescription$Type");
|
| LoadClass(jni, "org/webrtc/StatsReport");
|
| LoadClass(jni, "org/webrtc/StatsReport$Value");
|
| + LoadClass(jni, "org/webrtc/SurfaceTextureHelper");
|
| + LoadClass(jni, "org/webrtc/VideoCapturerAndroid");
|
| + LoadClass(jni, "org/webrtc/VideoCapturerAndroid$NativeObserver");
|
| LoadClass(jni, "org/webrtc/VideoRenderer$I420Frame");
|
| - LoadClass(jni, "org/webrtc/VideoCapturer");
|
| LoadClass(jni, "org/webrtc/VideoTrack");
|
| }
|
|
|
|
|