kylefang/react-native
1
0
Fork 0
mirror of https://github.com/zhigang1992/react-native.git synced 2026-04-09 22:43:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Invert native dependency of new bridge -> old bridge

Browse Source 
Reviewed By: mhorowitz

Differential Revision: D3374937

fbshipit-source-id: 58b082bba727e33a3b08361be3630d669fc8dc5b
This commit is contained in:
Chris Hopman
2016-06-06 16:01:52 -07:00
committed by Facebook Github Bot 2
parent 26a92220c2
commit bf010a4c17
36 changed files with 71 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ReactAndroid/src/main/java/com/facebook/react/bridge/JSCJavaScriptExecutor.java
View File

@@ -14,6 +14,10 @@ import com.facebook.soloader.SoLoader;
@DoNotStrip
public class JSCJavaScriptExecutor extends JavaScriptExecutor {
static {
ReactBridge.staticInit();
}
public static class Factory implements JavaScriptExecutor.Factory {
@Override
public JavaScriptExecutor create(WritableNativeMap jscConfig) throws Exception {
@@ -21,10 +25,6 @@ public class JSCJavaScriptExecutor extends JavaScriptExecutor {
}
}
static {
SoLoader.loadLibrary(ReactBridge.REACT_NATIVE_LIB);
}
public JSCJavaScriptExecutor(WritableNativeMap jscConfig) {
initialize(jscConfig);
}

2
ReactAndroid/src/main/java/com/facebook/react/bridge/NativeArray.java
View File

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

2
ReactAndroid/src/main/java/com/facebook/react/bridge/NativeMap.java
View File

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

8
ReactAndroid/src/main/java/com/facebook/react/bridge/ProxyJavaScriptExecutor.java
View File

@@ -24,6 +24,10 @@ import com.facebook.proguard.annotations.DoNotStrip;
*/
@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 class ProxyJavaScriptExecutor extends JavaScriptExecutor {
}
}
static {
SoLoader.loadLibrary(ReactBridge.REACT_NATIVE_LIB);
}
private @Nullable JavaJSExecutor mJavaJSExecutor;
/**

8
ReactAndroid/src/main/java/com/facebook/react/bridge/ReactBridge.java
View File

@@ -24,16 +24,22 @@ import com.facebook.soloader.SoLoader;
@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

3
ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableNativeArray.java
View File

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

3
ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableNativeMap.java
View File

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

3
ReactAndroid/src/main/java/com/facebook/react/bridge/WritableNativeArray.java
View File

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

2
ReactAndroid/src/main/java/com/facebook/react/bridge/WritableNativeMap.java
View File

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