From 260e6d23554a8e7f1743263894c9ca9a0cfbf01e Mon Sep 17 00:00:00 2001
From: Dmitry Zakharov <comfly@fb.com>
Date: Thu, 9 Nov 2017 09:49:34 -0800
Subject: [PATCH] Remove shared bridge experiment

Reviewed By: kathryngray

Differential Revision: D6284437

fbshipit-source-id: 14e0516f22dde04c0bbc4eb8fac603590d32d66a
---
 .../facebook/react/ReactInstanceManager.java  | 35 ++++++-------------
 .../react/ReactInstanceManagerBuilder.java    | 14 --------
 2 files changed, 10 insertions(+), 39 deletions(-)

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);
   }
 }