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

Move xreact/jni to react/jni

Browse Source 
Reviewed By: mhorowitz

Differential Revision: D5155612

fbshipit-source-id: 871a23916c0069498691dc0dd3c94fd2e404cec9
This commit is contained in:
Pieter De Baets
2017-06-01 05:30:34 -07:00
committed by Facebook Github Bot
parent 7c980c5ba5
commit bd5051adeb
63 changed files with 108 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
ReactAndroid/src/main/java/com/facebook/react/BUCK
View File

@@ -1,35 +1,33 @@
include_defs("//ReactAndroid/DEFS")
DEPS = [
react_native_dep("java/com/facebook/systrace:systrace"),
react_native_dep("libraries/fbcore/src/main/java/com/facebook/common/logging:logging"),
react_native_dep("libraries/soloader/java/com/facebook/soloader:soloader"),
react_native_dep("third-party/android/support/v4:lib-support-v4"),
react_native_dep("third-party/java/infer-annotations:infer-annotations"),
react_native_dep("third-party/java/jsr-305:jsr-305"),
react_native_target("java/com/facebook/react/bridge:bridge"),
react_native_target("java/com/facebook/react/common:common"),
react_native_target("java/com/facebook/react/devsupport:devsupport"),
react_native_target("java/com/facebook/react/devsupport:interfaces"),
react_native_target("java/com/facebook/react/jstasks:jstasks"),
react_native_target("java/com/facebook/react/module/annotations:annotations"),
react_native_target("java/com/facebook/react/module/model:model"),
react_native_target("java/com/facebook/react/modules/appregistry:appregistry"),
react_native_target("java/com/facebook/react/modules/core:core"),
react_native_target("java/com/facebook/react/modules/debug:debug"),
react_native_target("java/com/facebook/react/modules/debug:interfaces"),
react_native_target("java/com/facebook/react/modules/deviceinfo:deviceinfo"),
react_native_target("java/com/facebook/react/modules/systeminfo:systeminfo"),
react_native_target("java/com/facebook/react/modules/toast:toast"),
react_native_target("java/com/facebook/react/uimanager:uimanager"),
react_native_target("java/com/facebook/react/views/imagehelper:imagehelper"),
]
android_library(
name = "react",
srcs = glob(["*.java"]),
visibility = [
"PUBLIC",
],
deps = DEPS,
deps = [
react_native_dep("java/com/facebook/systrace:systrace"),
react_native_dep("libraries/fbcore/src/main/java/com/facebook/common/logging:logging"),
react_native_dep("libraries/soloader/java/com/facebook/soloader:soloader"),
react_native_dep("third-party/android/support/v4:lib-support-v4"),
react_native_dep("third-party/java/infer-annotations:infer-annotations"),
react_native_dep("third-party/java/jsr-305:jsr-305"),
react_native_target("java/com/facebook/react/bridge:bridge"),
react_native_target("java/com/facebook/react/common:common"),
react_native_target("java/com/facebook/react/devsupport:devsupport"),
react_native_target("java/com/facebook/react/devsupport:interfaces"),
react_native_target("java/com/facebook/react/jstasks:jstasks"),
react_native_target("java/com/facebook/react/module/annotations:annotations"),
react_native_target("java/com/facebook/react/module/model:model"),
react_native_target("java/com/facebook/react/modules/appregistry:appregistry"),
react_native_target("java/com/facebook/react/modules/core:core"),
react_native_target("java/com/facebook/react/modules/debug:debug"),
react_native_target("java/com/facebook/react/modules/debug:interfaces"),
react_native_target("java/com/facebook/react/modules/deviceinfo:deviceinfo"),
react_native_target("java/com/facebook/react/modules/systeminfo:systeminfo"),
react_native_target("java/com/facebook/react/modules/toast:toast"),
react_native_target("java/com/facebook/react/uimanager:uimanager"),
react_native_target("java/com/facebook/react/views/imagehelper:imagehelper"),
],
)

1
ReactAndroid/src/main/java/com/facebook/react/bridge/BUCK
View File

@@ -34,5 +34,6 @@ android_library(
react_native_dep("third-party/java/jsr-305:jsr-305"),
react_native_target("java/com/facebook/react/common:common"),
react_native_target("java/com/facebook/react/module/model:model"),
react_native_target("jni/react/jni:jni"),
],
)

5
ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java
View File

@@ -40,11 +40,8 @@ import com.facebook.systrace.TraceListener;
*/
@DoNotStrip
public class CatalystInstanceImpl implements CatalystInstance {
/* package */ static final String REACT_NATIVE_LIB = "reactnativejnifb";
static {
SoLoader.loadLibrary(REACT_NATIVE_LIB);
ReactBridge.staticInit();
}
private static final AtomicInteger sNextInstanceIdForTrace = new AtomicInteger(1);

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

@@ -16,7 +16,7 @@ import com.facebook.soloader.SoLoader;
public class CxxModuleWrapperBase implements NativeModule
{
static {
SoLoader.loadLibrary(CatalystInstanceImpl.REACT_NATIVE_LIB);
ReactBridge.staticInit();
}
@DoNotStrip

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

@@ -32,7 +32,7 @@ public class JSCJavaScriptExecutor extends JavaScriptExecutor {
}
static {
SoLoader.loadLibrary(CatalystInstanceImpl.REACT_NATIVE_LIB);
ReactBridge.staticInit();
}
public JSCJavaScriptExecutor(ReadableNativeArray jscConfig) {

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

@@ -39,7 +39,7 @@ public class ProxyJavaScriptExecutor extends JavaScriptExecutor {
}
static {
SoLoader.loadLibrary(CatalystInstanceImpl.REACT_NATIVE_LIB);
ReactBridge.staticInit();
}
private @Nullable JavaJSExecutor mJavaJSExecutor;

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

@@ -12,16 +12,11 @@ package com.facebook.react.bridge;
import com.facebook.soloader.SoLoader;
public class ReactBridge {
private static final String REACT_NATIVE_LIB = "reactnativejni";
private static final String XREACT_NATIVE_LIB = "reactnativejnifb";
static {
staticInit();
SoLoader.loadLibrary("reactnativejni");
}
public static void staticInit() {
SoLoader.loadLibrary(REACT_NATIVE_LIB);
SoLoader.loadLibrary(XREACT_NATIVE_LIB);
// This method only exists to trigger the static initializer above
}
}