Enable the Java wrapper to load different .so library.

webrtc/sdk/android/src/jni/peerconnection_jni.cc

Index: webrtc/sdk/android/src/jni/peerconnection_jni.cc
diff --git a/webrtc/sdk/android/src/jni/peerconnection_jni.cc b/webrtc/sdk/android/src/jni/peerconnection_jni.cc
index c07d58faffc6210116057b02cf9d52f3a9432ea8..080ff1c051960359d8cec0c559bb8dd967274d48 100644
--- a/webrtc/sdk/android/src/jni/peerconnection_jni.cc
+++ b/webrtc/sdk/android/src/jni/peerconnection_jni.cc
@@ -123,7 +123,7 @@ namespace webrtc_jni {
 // Field trials initialization string
 static char *field_trials_init_string = NULL;
 
-// Set in PeerConnectionFactory_initializeAndroidGlobals().
+// Set in PeerConnectionFactoryBase_initializeAndroidGlobals().
 static bool factory_static_initialized = false;
 static bool video_hw_acceleration_enabled = true;
 static jobject j_application_context = nullptr;
@@ -1131,12 +1131,12 @@ JOW(void, MediaStream_free)(JNIEnv*, jclass, jlong j_p) {
   CHECK_RELEASE(reinterpret_cast<MediaStreamInterface*>(j_p));
 }
 
-JOW(jlong, PeerConnectionFactory_nativeCreateObserver)(
-    JNIEnv * jni, jclass, jobject j_observer) {
+JOW(jlong, PeerConnectionFactoryBase_nativeCreateObserver)
+(JNIEnv* jni, jclass, jobject j_observer) {
   return (jlong)new PCOJava(jni, j_observer);
 }
 
-JOW(void, PeerConnectionFactory_initializeAndroidGlobals)
+JOW(void, PeerConnectionFactoryBase_initializeAndroidGlobals)
 (JNIEnv* jni,
  jclass,
  jobject context,
@@ -1151,8 +1151,8 @@ JOW(void, PeerConnectionFactory_initializeAndroidGlobals)
   }
 }
 
-JOW(void, PeerConnectionFactory_initializeFieldTrials)(
-    JNIEnv* jni, jclass, jstring j_trials_init_string) {
+JOW(void, PeerConnectionFactoryBase_initializeFieldTrials)
+(JNIEnv* jni, jclass, jstring j_trials_init_string) {
   field_trials_init_string = NULL;
   if (j_trials_init_string != NULL) {
     const char* init_string =
@@ -1166,18 +1166,19 @@ JOW(void, PeerConnectionFactory_initializeFieldTrials)(
   webrtc::field_trial::InitFieldTrialsFromString(field_trials_init_string);
 }
 
-JOW(void, PeerConnectionFactory_initializeInternalTracer)(JNIEnv* jni, jclass) {
+JOW(void, PeerConnectionFactoryBase_initializeInternalTracer)
+(JNIEnv* jni, jclass) {
   rtc::tracing::SetupInternalTracer();
 }
 
-JOW(jstring, PeerConnectionFactory_nativeFieldTrialsFindFullName)
+JOW(jstring, PeerConnectionFactoryBase_nativeFieldTrialsFindFullName)
 (JNIEnv* jni, jclass, jstring j_name) {
   return JavaStringFromStdString(
       jni, webrtc::field_trial::FindFullName(JavaToStdString(jni, j_name)));
 }
 
-JOW(jboolean, PeerConnectionFactory_startInternalTracingCapture)(
-    JNIEnv* jni, jclass, jstring j_event_tracing_filename) {
+JOW(jboolean, PeerConnectionFactoryBase_startInternalTracingCapture)
+(JNIEnv* jni, jclass, jstring j_event_tracing_filename) {
   if (!j_event_tracing_filename)
     return false;
 
@@ -1189,12 +1190,13 @@ JOW(jboolean, PeerConnectionFactory_startInternalTracingCapture)(
   return ret;
 }
 
-JOW(void, PeerConnectionFactory_stopInternalTracingCapture)(
-    JNIEnv* jni, jclass) {
+JOW(void, PeerConnectionFactoryBase_stopInternalTracingCapture)
+(JNIEnv* jni, jclass) {
   rtc::tracing::StopInternalCapture();
 }
 
-JOW(void, PeerConnectionFactory_shutdownInternalTracer)(JNIEnv* jni, jclass) {
+JOW(void, PeerConnectionFactoryBase_shutdownInternalTracer)
+(JNIEnv* jni, jclass) {
   rtc::tracing::ShutdownInternalTracer();
 }
 
@@ -1320,8 +1322,8 @@ PeerConnectionFactoryInterface::Options ParseOptionsFromJava(JNIEnv* jni,
   return native_options;
 }
 
-JOW(jlong, PeerConnectionFactory_nativeCreatePeerConnectionFactory)(
-    JNIEnv* jni, jclass, jobject joptions) {
+JOW(jlong, PeerConnectionFactoryBase_nativeCreatePeerConnectionFactory)
+(JNIEnv* jni, jclass, jobject joptions) {
   // talk/ assumes pretty widely that the current Thread is ThreadManager'd, but
   // ThreadManager only WrapCurrentThread()s the thread where it is first
   // created.  Since the semantics around when auto-wrapping happens in
@@ -1383,7 +1385,8 @@ JOW(jlong, PeerConnectionFactory_nativeCreatePeerConnectionFactory)(
   return jlongFromPointer(owned_factory);
 }
 
-JOW(void, PeerConnectionFactory_nativeFreeFactory)(JNIEnv*, jclass, jlong j_p) {
+JOW(void, PeerConnectionFactoryBase_nativeFreeFactory)
+(JNIEnv*, jclass, jlong j_p) {
   delete reinterpret_cast<OwnedFactoryAndThreads*>(j_p);
   if (field_trials_init_string) {
     webrtc::field_trial::InitFieldTrialsFromString(NULL);
@@ -1397,15 +1400,15 @@ static PeerConnectionFactoryInterface* factoryFromJava(jlong j_p) {
   return reinterpret_cast<OwnedFactoryAndThreads*>(j_p)->factory();
 }
 
-JOW(void, PeerConnectionFactory_nativeThreadsCallbacks)(
-    JNIEnv*, jclass, jlong j_p) {
+JOW(void, PeerConnectionFactoryBase_nativeThreadsCallbacks)
+(JNIEnv*, jclass, jlong j_p) {
   OwnedFactoryAndThreads *factory =
       reinterpret_cast<OwnedFactoryAndThreads*>(j_p);
   factory->InvokeJavaCallbacksOnFactoryThreads();
 }
 
-JOW(jlong, PeerConnectionFactory_nativeCreateLocalMediaStream)(
-    JNIEnv* jni, jclass, jlong native_factory, jstring label) {
+JOW(jlong, PeerConnectionFactoryBase_nativeCreateLocalMediaStream)
+(JNIEnv* jni, jclass, jlong native_factory, jstring label) {
   rtc::scoped_refptr<PeerConnectionFactoryInterface> factory(
       factoryFromJava(native_factory));
   rtc::scoped_refptr<MediaStreamInterface> stream(
@@ -1413,7 +1416,7 @@ JOW(jlong, PeerConnectionFactory_nativeCreateLocalMediaStream)(
   return (jlong)stream.release();
 }
 
-JOW(jlong, PeerConnectionFactory_nativeCreateVideoSource)
+JOW(jlong, PeerConnectionFactoryBase_nativeCreateVideoSource)
 (JNIEnv* jni, jclass, jlong native_factory, jobject j_egl_context,
     jboolean is_screencast) {
   OwnedFactoryAndThreads* factory =
@@ -1429,14 +1432,14 @@ JOW(jlong, PeerConnectionFactory_nativeCreateVideoSource)
   return (jlong)proxy_source.release();
 }
 
-JOW(void, PeerConnectionFactory_nativeInitializeVideoCapturer)
+JOW(void, PeerConnectionFactoryBase_nativeInitializeVideoCapturer)
 (JNIEnv* jni,
  jclass,
  jlong native_factory,
  jobject j_video_capturer,
  jlong native_source,
  jobject j_frame_observer) {
-  LOG(LS_INFO) << "PeerConnectionFactory_nativeInitializeVideoCapturer";
+  LOG(LS_INFO) << "PeerConnectionFactoryBase_nativeInitializeVideoCapturer";
   rtc::scoped_refptr<PeerConnectionFactoryInterface> factory(
       factoryFromJava(native_factory));
   auto proxy_source =
@@ -1457,9 +1460,8 @@ JOW(void, PeerConnectionFactory_nativeInitializeVideoCapturer)
   CHECK_EXCEPTION(jni) << "error during VideoCapturer.initialize()";
 }
 
-JOW(jlong, PeerConnectionFactory_nativeCreateVideoTrack)(
-    JNIEnv* jni, jclass, jlong native_factory, jstring id,
-    jlong native_source) {
+JOW(jlong, PeerConnectionFactoryBase_nativeCreateVideoTrack)
+(JNIEnv* jni, jclass, jlong native_factory, jstring id, jlong native_source) {
   rtc::scoped_refptr<PeerConnectionFactoryInterface> factory(
       factoryFromJava(native_factory));
   rtc::scoped_refptr<VideoTrackInterface> track(factory->CreateVideoTrack(
@@ -1468,8 +1470,8 @@ JOW(jlong, PeerConnectionFactory_nativeCreateVideoTrack)(
   return (jlong)track.release();
 }
 
-JOW(jlong, PeerConnectionFactory_nativeCreateAudioSource)(
-    JNIEnv* jni, jclass, jlong native_factory, jobject j_constraints) {
+JOW(jlong, PeerConnectionFactoryBase_nativeCreateAudioSource)
+(JNIEnv* jni, jclass, jlong native_factory, jobject j_constraints) {
   std::unique_ptr<ConstraintsWrapper> constraints(
       new ConstraintsWrapper(jni, j_constraints));
   rtc::scoped_refptr<PeerConnectionFactoryInterface> factory(
@@ -1481,9 +1483,8 @@ JOW(jlong, PeerConnectionFactory_nativeCreateAudioSource)(
   return (jlong)source.release();
 }
 
-JOW(jlong, PeerConnectionFactory_nativeCreateAudioTrack)(
-    JNIEnv* jni, jclass, jlong native_factory, jstring id,
-    jlong native_source) {
+JOW(jlong, PeerConnectionFactoryBase_nativeCreateAudioTrack)
+(JNIEnv* jni, jclass, jlong native_factory, jstring id, jlong native_source) {
   rtc::scoped_refptr<PeerConnectionFactoryInterface> factory(
       factoryFromJava(native_factory));
   rtc::scoped_refptr<AudioTrackInterface> track(factory->CreateAudioTrack(
@@ -1492,23 +1493,26 @@ JOW(jlong, PeerConnectionFactory_nativeCreateAudioTrack)(
   return (jlong)track.release();
 }
 
-JOW(jboolean, PeerConnectionFactory_nativeStartAecDump)(
-    JNIEnv* jni, jclass, jlong native_factory, jint file,
-    jint filesize_limit_bytes) {
+JOW(jboolean, PeerConnectionFactoryBase_nativeStartAecDump)
+(JNIEnv* jni,
+ jclass,
+ jlong native_factory,
+ jint file,
+ jint filesize_limit_bytes) {
   rtc::scoped_refptr<PeerConnectionFactoryInterface> factory(
       factoryFromJava(native_factory));
   return factory->StartAecDump(file, filesize_limit_bytes);
 }
 
-JOW(void, PeerConnectionFactory_nativeStopAecDump)(
-    JNIEnv* jni, jclass, jlong native_factory) {
+JOW(void, PeerConnectionFactoryBase_nativeStopAecDump)
+(JNIEnv* jni, jclass, jlong native_factory) {
   rtc::scoped_refptr<PeerConnectionFactoryInterface> factory(
       factoryFromJava(native_factory));
   factory->StopAecDump();
 }
 
-JOW(void, PeerConnectionFactory_nativeSetOptions)(
-    JNIEnv* jni, jclass, jlong native_factory, jobject options) {
+JOW(void, PeerConnectionFactoryBase_nativeSetOptions)
+(JNIEnv* jni, jclass, jlong native_factory, jobject options) {
   rtc::scoped_refptr<PeerConnectionFactoryInterface> factory(
       factoryFromJava(native_factory));
   PeerConnectionFactoryInterface::Options options_to_set =
@@ -1526,9 +1530,12 @@ JOW(void, PeerConnectionFactory_nativeSetOptions)(
   }
 }
 
-JOW(void, PeerConnectionFactory_nativeSetVideoHwAccelerationOptions)(
-    JNIEnv* jni, jclass, jlong native_factory, jobject local_egl_context,
-    jobject remote_egl_context) {
+JOW(void, PeerConnectionFactoryBase_nativeSetVideoHwAccelerationOptions)
+(JNIEnv* jni,
+ jclass,
+ jlong native_factory,
+ jobject local_egl_context,
+ jobject remote_egl_context) {
   OwnedFactoryAndThreads* owned_factory =
       reinterpret_cast<OwnedFactoryAndThreads*>(native_factory);
 
@@ -1838,9 +1845,13 @@ static void JavaRTCConfigurationToJsepRTCConfiguration(
       GetBooleanField(jni, j_rtc_config, j_disable_ipv6_on_wifi_id);
 }
 
-JOW(jlong, PeerConnectionFactory_nativeCreatePeerConnection)(
-    JNIEnv *jni, jclass, jlong factory, jobject j_rtc_config,
-    jobject j_constraints, jlong observer_p) {
+JOW(jlong, PeerConnectionFactoryBase_nativeCreatePeerConnection)
+(JNIEnv* jni,
+ jclass,
+ jlong factory,
+ jobject j_rtc_config,
+ jobject j_constraints,
+ jlong observer_p) {
   rtc::scoped_refptr<PeerConnectionFactoryInterface> f(
       reinterpret_cast<PeerConnectionFactoryInterface*>(
           factoryFromJava(factory)));