diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java index ab850f9cf52..aa317e7503b 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java @@ -236,8 +236,6 @@ public class ReactInstanceManager { @Nullable DevBundleDownloadListener devBundleDownloadListener, boolean useSeparateUIBackgroundThread, int minNumShakes, - boolean splitPackagesEnabled, - boolean useOnlyDefaultPackages, int minTimeLeftInFrameForNonBatchedOperationMs) { Log.d(ReactConstants.TAG, "ReactInstanceManager.ctor()"); initializeSoLoaderIfNecessary(applicationContext); @@ -273,30 +271,17 @@ public class ReactInstanceManager { mUseSeparateUIBackgroundThread = useSeparateUIBackgroundThread; mMinNumShakes = minNumShakes; synchronized (mPackages) { - if (!splitPackagesEnabled) { - CoreModulesPackage coreModulesPackage = - new CoreModulesPackage( - this, - 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)); - } + PrinterHolder.getPrinter().logMessage(ReactDebugOverlayTags.RN_CORE, "RNCore: Use Split Packages"); + mPackages.add(new BridgeCorePackage(this, mBackBtnHandler)); + if (mUseDeveloperSupport) { + mPackages.add(new DebugCorePackage()); } + mPackages.add( + new ReactNativeCorePackage( + this, + mUIImplementationProvider, + mLazyViewManagersEnabled, + mMinTimeLeftInFrameForNonBatchedOperationMs)); mPackages.addAll(packages); } diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManagerBuilder.java b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManagerBuilder.java index 59eaa71e724..2fbaaa2b80c 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManagerBuilder.java +++ b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManagerBuilder.java @@ -48,8 +48,6 @@ public class ReactInstanceManagerBuilder { private @Nullable JavaScriptExecutorFactory mJavaScriptExecutorFactory; private boolean mUseSeparateUIBackgroundThread; private int mMinNumShakes = 1; - private boolean mEnableSplitPackage; - private boolean mUseOnlyDefaultPackages; private int mMinTimeLeftInFrameForNonBatchedOperationMs = -1; /* package protected */ ReactInstanceManagerBuilder() { @@ -227,16 +225,6 @@ public class ReactInstanceManagerBuilder { return this; } - public ReactInstanceManagerBuilder setEnableSplitPackage(boolean enableSplitPackage) { - mEnableSplitPackage = enableSplitPackage; - return this; - } - - public ReactInstanceManagerBuilder setUseOnlyDefaultPackages(boolean useOnlyDefaultPackages) { - mUseOnlyDefaultPackages = useOnlyDefaultPackages; - return this; - } - public ReactInstanceManagerBuilder setMinTimeLeftInFrameForNonBatchedOperationMs( int minTimeLeftInFrameForNonBatchedOperationMs) { mMinTimeLeftInFrameForNonBatchedOperationMs = minTimeLeftInFrameForNonBatchedOperationMs; @@ -300,8 +288,6 @@ public class ReactInstanceManagerBuilder { mDevBundleDownloadListener, mUseSeparateUIBackgroundThread, mMinNumShakes, - mEnableSplitPackage, - mUseOnlyDefaultPackages, mMinTimeLeftInFrameForNonBatchedOperationMs); } }