status-im
/
react-native
mirror of https://github.com/status-im/react-native.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove shared bridge experiment 

Reviewed By: kathryngray

Differential Revision: D6284437

fbshipit-source-id: 14e0516f22dde04c0bbc4eb8fac603590d32d66a
This commit is contained in:
Dmitry Zakharov 2017-11-09 09:49:34 -08:00 committed by Facebook Github Bot
parent e11d496e9d
commit 260e6d2355
2 changed files with 10 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java
View File

@ -236,8 +236,6 @@ public class ReactInstanceManager {
@Nullable DevBundleDownloadListener devBundleDownloadListener, @Nullable DevBundleDownloadListener devBundleDownloadListener,
boolean useSeparateUIBackgroundThread, boolean useSeparateUIBackgroundThread,
int minNumShakes, int minNumShakes,
boolean splitPackagesEnabled,
boolean useOnlyDefaultPackages,
int minTimeLeftInFrameForNonBatchedOperationMs) { int minTimeLeftInFrameForNonBatchedOperationMs) {
Log.d(ReactConstants.TAG, "ReactInstanceManager.ctor()"); Log.d(ReactConstants.TAG, "ReactInstanceManager.ctor()");
initializeSoLoaderIfNecessary(applicationContext); initializeSoLoaderIfNecessary(applicationContext);
@ -273,30 +271,17 @@ public class ReactInstanceManager {
mUseSeparateUIBackgroundThread = useSeparateUIBackgroundThread; mUseSeparateUIBackgroundThread = useSeparateUIBackgroundThread;
mMinNumShakes = minNumShakes; mMinNumShakes = minNumShakes;
synchronized (mPackages) { synchronized (mPackages) {
if (!splitPackagesEnabled) { PrinterHolder.getPrinter().logMessage(ReactDebugOverlayTags.RN_CORE, "RNCore: Use Split Packages");
CoreModulesPackage coreModulesPackage = mPackages.add(new BridgeCorePackage(this, mBackBtnHandler));
new CoreModulesPackage( if (mUseDeveloperSupport) {
this, mPackages.add(new DebugCorePackage());
mBackBtnHandler,
mUIImplementationProvider,
mLazyViewManagersEnabled,
mMinTimeLeftInFrameForNonBatchedOperationMs);
mPackages.add(coreModulesPackage);
} else {
PrinterHolder.getPrinter().logMessage(ReactDebugOverlayTags.RN_CORE, "RNCore: Use Split Packages");
mPackages.add(new BridgeCorePackage(this, mBackBtnHandler));
if (mUseDeveloperSupport) {
mPackages.add(new DebugCorePackage());
}
if (!useOnlyDefaultPackages) {
mPackages.add(
new ReactNativeCorePackage(
this,
mUIImplementationProvider,
mLazyViewManagersEnabled,
mMinTimeLeftInFrameForNonBatchedOperationMs));
}
} }
mPackages.add(
new ReactNativeCorePackage(
this,
mUIImplementationProvider,
mLazyViewManagersEnabled,
mMinTimeLeftInFrameForNonBatchedOperationMs));
mPackages.addAll(packages); mPackages.addAll(packages);
} }

14
ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManagerBuilder.java
View File

@ -48,8 +48,6 @@ public class ReactInstanceManagerBuilder {
private @Nullable JavaScriptExecutorFactory mJavaScriptExecutorFactory; private @Nullable JavaScriptExecutorFactory mJavaScriptExecutorFactory;
private boolean mUseSeparateUIBackgroundThread; private boolean mUseSeparateUIBackgroundThread;
private int mMinNumShakes = 1; private int mMinNumShakes = 1;
private boolean mEnableSplitPackage;
private boolean mUseOnlyDefaultPackages;
private int mMinTimeLeftInFrameForNonBatchedOperationMs = -1; private int mMinTimeLeftInFrameForNonBatchedOperationMs = -1;
/* package protected */ ReactInstanceManagerBuilder() { /* package protected */ ReactInstanceManagerBuilder() {
@ -227,16 +225,6 @@ public class ReactInstanceManagerBuilder {
return this; return this;
} }
public ReactInstanceManagerBuilder setEnableSplitPackage(boolean enableSplitPackage) {
mEnableSplitPackage = enableSplitPackage;
return this;
}
public ReactInstanceManagerBuilder setUseOnlyDefaultPackages(boolean useOnlyDefaultPackages) {
mUseOnlyDefaultPackages = useOnlyDefaultPackages;
return this;
}
public ReactInstanceManagerBuilder setMinTimeLeftInFrameForNonBatchedOperationMs( public ReactInstanceManagerBuilder setMinTimeLeftInFrameForNonBatchedOperationMs(
int minTimeLeftInFrameForNonBatchedOperationMs) { int minTimeLeftInFrameForNonBatchedOperationMs) {
mMinTimeLeftInFrameForNonBatchedOperationMs = minTimeLeftInFrameForNonBatchedOperationMs; mMinTimeLeftInFrameForNonBatchedOperationMs = minTimeLeftInFrameForNonBatchedOperationMs;
@ -300,8 +288,6 @@ public class ReactInstanceManagerBuilder {
mDevBundleDownloadListener, mDevBundleDownloadListener,
mUseSeparateUIBackgroundThread, mUseSeparateUIBackgroundThread,
mMinNumShakes, mMinNumShakes,
mEnableSplitPackage,
mUseOnlyDefaultPackages,
mMinTimeLeftInFrameForNonBatchedOperationMs); mMinTimeLeftInFrameForNonBatchedOperationMs);
} }
} }