Invert native dependency of new bridge -> old bridge

Reviewed By: mhorowitz

Differential Revision: D3374937

fbshipit-source-id: 58b082bba727e33a3b08361be3630d669fc8dc5b

Author: cjhopman

ReactAndroid/src/main/java/com/facebook/react/bridge/JSCJavaScriptExecutor.java

@@ -14,17 +14,17 @@
 
 @DoNotStrip
 public class JSCJavaScriptExecutor extends JavaScriptExecutor {
+  static {
+    ReactBridge.staticInit();
+  }
+
   public static class Factory implements JavaScriptExecutor.Factory {
     @Override
     public JavaScriptExecutor create(WritableNativeMap jscConfig) throws Exception {
       return new JSCJavaScriptExecutor(jscConfig);
     }
   }
 
-  static {
-    SoLoader.loadLibrary(ReactBridge.REACT_NATIVE_LIB);
-  }
-
   public JSCJavaScriptExecutor(WritableNativeMap jscConfig) {
     initialize(jscConfig);
   }

ReactAndroid/src/main/java/com/facebook/react/bridge/NativeArray.java

@@ -19,7 +19,7 @@
 @DoNotStrip
 public abstract class NativeArray {
   static {
-    SoLoader.loadLibrary(ReactBridge.REACT_NATIVE_LIB);
+    ReactBridge.staticInit();
   }
 
   protected NativeArray(HybridData hybridData) {

ReactAndroid/src/main/java/com/facebook/react/bridge/NativeMap.java

@@ -19,7 +19,7 @@
 @DoNotStrip
 public abstract class NativeMap {
   static {
-    SoLoader.loadLibrary(ReactBridge.REACT_NATIVE_LIB);
+    ReactBridge.staticInit();
   }
 
   public NativeMap(HybridData hybridData) {

ReactAndroid/src/main/java/com/facebook/react/bridge/ProxyJavaScriptExecutor.java

@@ -24,6 +24,10 @@
  */
 @DoNotStrip
 public class ProxyJavaScriptExecutor extends JavaScriptExecutor {
+  static {
+    ReactBridge.staticInit();
+  }
+
   public static class Factory implements JavaScriptExecutor.Factory {
     private final JavaJSExecutor.Factory mJavaJSExecutorFactory;
 
@@ -37,10 +41,6 @@ public JavaScriptExecutor create(WritableNativeMap jscConfig) throws Exception {
     }
   }
 
-  static {
-    SoLoader.loadLibrary(ReactBridge.REACT_NATIVE_LIB);
-  }
-
   private @Nullable JavaJSExecutor mJavaJSExecutor;
 
   /**

ReactAndroid/src/main/java/com/facebook/react/bridge/ReactBridge.java

@@ -24,16 +24,22 @@
 @DoNotStrip
 public class ReactBridge extends Countable {
 
-  /* package */ static final String REACT_NATIVE_LIB = "reactnativejni";
+  private static final String REACT_NATIVE_LIB = "reactnativejni";
+  private static final String XREACT_NATIVE_LIB = "reactnativejnifb";
 
   static {
     SoLoader.loadLibrary(REACT_NATIVE_LIB);
+    SoLoader.loadLibrary(XREACT_NATIVE_LIB);
   }
 
   private final ReactCallback mCallback;
   private final JavaScriptExecutor mJSExecutor;
   private final MessageQueueThread mNativeModulesQueueThread;
 
+  public static void staticInit() {
+    // This is just called to ensure that ReactBridge's static initialization has taken place.
+  }
+
   /**
    * @param jsExecutor the JS executor to use to run JS
    * @param callback the callback class used to invoke native modules

ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableNativeArray.java

@@ -21,9 +21,8 @@
  */
 @DoNotStrip
 public class ReadableNativeArray extends NativeArray implements ReadableArray {
-
   static {
-    SoLoader.loadLibrary(ReactBridge.REACT_NATIVE_LIB);
+    ReactBridge.staticInit();
   }
 
   protected ReadableNativeArray(HybridData hybridData) {

ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableNativeMap.java

@@ -22,9 +22,8 @@
  */
 @DoNotStrip
 public class ReadableNativeMap extends NativeMap implements ReadableMap {
-
   static {
-    SoLoader.loadLibrary(ReactBridge.REACT_NATIVE_LIB);
+    ReactBridge.staticInit();
   }
 
   protected ReadableNativeMap(HybridData hybridData) {

ReactAndroid/src/main/java/com/facebook/react/bridge/WritableNativeArray.java

@@ -21,9 +21,8 @@
  */
 @DoNotStrip
 public class WritableNativeArray extends ReadableNativeArray implements WritableArray {
-
   static {
-    SoLoader.loadLibrary(ReactBridge.REACT_NATIVE_LIB);
+    ReactBridge.staticInit();
   }
 
   public WritableNativeArray() {

ReactAndroid/src/main/java/com/facebook/react/bridge/WritableNativeMap.java

@@ -22,7 +22,7 @@
 @DoNotStrip
 public class WritableNativeMap extends ReadableNativeMap implements WritableMap {
   static {
-    SoLoader.loadLibrary(ReactBridge.REACT_NATIVE_LIB);
+    ReactBridge.staticInit();
   }
 
   @Override

ReactAndroid/src/main/jni/react/jni/Android.mk

@@ -11,15 +11,8 @@ LOCAL_SRC_FILES := \
   JSLoader.cpp \
   JSLogging.cpp \
   JniJSModulesUnbundle.cpp \
-  NativeArray.cpp \
-  NativeCommon.cpp \
-  NativeMap.cpp \
   OnLoad.cpp \
   ProxyExecutor.cpp \
-  ReadableNativeArray.cpp \
-  ReadableNativeMap.cpp \
-  WritableNativeArray.cpp \
-  WritableNativeMap.cpp \
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../.. $(LOCAL_PATH)/..
@@ -30,7 +23,7 @@ LOCAL_CFLAGS += $(CXX11_FLAGS)
 LOCAL_EXPORT_CPPFLAGS := $(CXX11_FLAGS)
 
 LOCAL_LDLIBS += -landroid
-LOCAL_SHARED_LIBRARIES := libfolly_json libfb libjsc libglog_init
+LOCAL_SHARED_LIBRARIES := libfolly_json libfb libjsc libglog_init libreactnativejnifb
 LOCAL_STATIC_LIBRARIES := libreactnative
 
 include $(BUILD_SHARED_LIBRARY)
@@ -41,3 +34,4 @@ $(call import-module,folly)
 $(call import-module,fbgloginit)
 $(call import-module,fb)
 $(call import-module,jsc)
+$(call import-module,xreact/jni)