Clearing dead code or unnecessary cosmetic fixes to reduce the differences (#251)

mganandraj · web-flow · commit 18b4b049cc03 · 2020-02-20T09:21:04.000-08:00
* Miscellaneous cleanups

* Cleaning up dead code and unwanted edits and renames

* Bringing back some changes for devmain to work

* Reverting unnecessary changes in a couple of files.

* Fixing the MAC/iOS PR build by including unistd.h back
diff --git a/ReactAndroid/build.gradle b/ReactAndroid/build.gradle
@@ -372,4 +372,4 @@ dependencies {
     androidTestImplementation("org.mockito:mockito-core:${MOCKITO_CORE_VERSION}")
 }
 
-apply(from: "release.gradle")
+apply(from: "release.gradle")
diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java
@@ -56,7 +56,6 @@
 import com.facebook.react.bridge.JavaJSExecutor;
 import com.facebook.react.bridge.JavaScriptExecutor;
 import com.facebook.react.bridge.JavaScriptExecutorFactory;
-import com.facebook.react.bridge.NativeArray;
 import com.facebook.react.bridge.NativeDeltaClient;
 import com.facebook.react.bridge.NativeModuleCallExceptionHandler;
 import com.facebook.react.bridge.NativeModuleRegistry;
@@ -170,19 +169,9 @@ public interface ReactInstanceEventListener {
   private final @Nullable NativeModuleCallExceptionHandler mNativeModuleCallExceptionHandler;
   private final @Nullable JSIModulePackage mJSIModulePackage;
   private List<ViewManager> mViewManagers;
-  private final int mMinNumShakes;
-  private final int mMinTimeLeftInFrameForNonBatchedOperationMs;
   private boolean mIsContextCreatedOnUIThread;
   private @Nullable CatalystInstanceEventListener mCatalystInstanceEventListener;
 
-  private final DefaultHardwareBackBtnHandler mBackBtnHandler =
-      new DefaultHardwareBackBtnHandler() {
-        @Override
-        public void invokeDefaultOnBackPressed() {
-          ReactInstanceManager.this.invokeDefaultOnBackPressed();
-        }
-      };
-
   private class ReactContextInitParams {
     private final JavaScriptExecutorFactory mJsExecutorFactory;
     private final JSBundleLoader mJsBundleLoader;
@@ -260,8 +249,6 @@ public static ReactInstanceManagerBuilder builder() {
     mLifecycleState = initialLifecycleState;
     mMemoryPressureRouter = new MemoryPressureRouter(applicationContext);
     mNativeModuleCallExceptionHandler = nativeModuleCallExceptionHandler;
-    mMinTimeLeftInFrameForNonBatchedOperationMs = minTimeLeftInFrameForNonBatchedOperationMs;
-    mMinNumShakes = minNumShakes;
     synchronized (mPackages) {
       PrinterHolder.getPrinter()
           .logMessage(ReactDebugOverlayTags.RN_CORE, "RNCore: Use Split Packages");
@@ -356,39 +343,10 @@ public void createReactContextInBackground() {
     recreateReactContextInBackgroundInner();
   }
 
-  @ThreadConfined(UI)
-  public void registerAdditionalPackages(List<ReactPackage> packages) {
-    if (packages == null || packages.isEmpty()) {
-      return;
-    }
-
-    // CatalystInstance hasn't been created, so add packages for later evaluation
-    if (!hasStartedCreatingInitialContext()) {
-      synchronized (mPackages) {
-        for (ReactPackage p : packages) {
-          if (!mPackages.contains(p)) {
-            mPackages.add(p);
-          }
-        }
-      }
-      return;
-    }
-
-    ReactContext context = getCurrentReactContext();
-    CatalystInstance catalystInstance = context != null ? context.getCatalystInstance() : null;
-
-    Assertions.assertNotNull(catalystInstance, "CatalystInstance null after hasStartedCreatingInitialContext true.");
-
-    // Do not create the new context but use the one we have already avaialable else NativeModuleRegistry will complain.
-    final ReactApplicationContext reactContext =  (ReactApplicationContext)context;
-
-    NativeModuleRegistry nativeModuleRegistry = processPackages(reactContext, packages, true);
-    catalystInstance.extendNativeModules(nativeModuleRegistry);
-  }
-
   /**
    *
    * Register CatalystInstanceEventListener
+   * This methods is called from Office ReactNativeHost
    */
   public void setCatalystInstanceEventListener(CatalystInstanceEventListener catalystInstanceEventListener) {
     mCatalystInstanceEventListener = catalystInstanceEventListener;
@@ -1041,6 +999,10 @@ public void run() {
     mCreateReactContextThread.start();
   }
 
+/**
+   *
+   * This method was added for Office ReactNativeHost consumption. But currently is not being used. Candidate for deletion.
+   */
   @ThreadConfined(UI)
   public ReactContext createReactContextOnUIThread() {
     Log.d(ReactConstants.TAG, "ReactInstanceManager.createReactContextOnUIThread()");
@@ -1103,8 +1065,8 @@ private void setupReactContext(final ReactApplicationContext reactContext) {
     if (!mIsContextCreatedOnUIThread) {
       ReactMarker.logMarker(ATTACH_MEASURED_ROOT_VIEWS_START);
       synchronized (mAttachedReactRoots) {
-        for (ReactRoot mAttachedReactRoots : mAttachedReactRoots) {
-          attachRootViewToInstance(mAttachedReactRoots);
+        for (ReactRoot reactRoot : mAttachedReactRoots) {
+          attachRootViewToInstance(reactRoot);
         }
       }
       ReactMarker.logMarker(ATTACH_MEASURED_ROOT_VIEWS_END);
diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManagerBuilder.java b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManagerBuilder.java
@@ -15,12 +15,10 @@
 import com.facebook.react.bridge.JavaScriptExecutorFactory;
 import com.facebook.react.bridge.NativeModuleCallExceptionHandler;
 import com.facebook.react.bridge.NotThreadSafeBridgeIdleDebugListener;
-import com.facebook.react.bridge.WritableNativeMap;
 import com.facebook.react.common.LifecycleState;
 import com.facebook.react.devsupport.RedBoxHandler;
 import com.facebook.react.devsupport.interfaces.DevBundleDownloadListener;
 import com.facebook.react.devsupport.interfaces.DevSupportManager;
-import com.facebook.react.jscexecutor.JSCExecutorFactory;
 import com.facebook.react.v8executor.V8ExecutorFactory;
 import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler;
 import com.facebook.react.packagerconnection.RequestHandler;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeModuleRegistry.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeModuleRegistry.java
@@ -15,7 +15,6 @@
 import java.util.Map;
 
 /** A set of Java APIs to expose to a particular JavaScript instance. */
-
 public class NativeModuleRegistry {
 
   private final ReactApplicationContext mReactApplicationContext;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactBridge.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactBridge.java
@@ -18,6 +18,7 @@ public class ReactBridge {
   private static volatile long sLoadEndTime = 0;
 
   private static boolean sDidInit = false;
+
   public synchronized static void staticInit() {
     if (sDidInit) {
       return;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/jscexecutor/JSCExecutorFactory.java b/ReactAndroid/src/main/java/com/facebook/react/jscexecutor/JSCExecutorFactory.java
@@ -33,4 +33,4 @@ public JavaScriptExecutor create() throws Exception {
   public String toString() {
     return "JSIExecutor+JSCRuntime";
   }
-}
+}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/module/annotations/BUCK b/ReactAndroid/src/main/java/com/facebook/react/module/annotations/BUCK
@@ -3,6 +3,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_tar
 rn_android_library(
     name = "annotations",
     srcs = glob(["**/*.java"]),
+    required_for_source_only_abi = True,
     visibility = [
         "PUBLIC",
     ],
diff --git a/ReactAndroid/src/main/java/com/facebook/react/module/processing/BUCK b/ReactAndroid/src/main/java/com/facebook/react/module/processing/BUCK
@@ -2,6 +2,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_tar
 
 rn_java_annotation_processor(
     name = "processing",
+    does_not_affect_abi = True,
     processor_class = "com.facebook.react.module.processing.ReactModuleSpecProcessor",
     visibility = [
         "PUBLIC",
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManager.java
@@ -43,7 +43,6 @@ public abstract class ViewManager<T extends View, C extends ReactShadowNode>
    * @param props
    */
   public void updateProperties(@Nonnull T viewToUpdate, ReactStylesDiffMap props) {
-
     ViewManagerPropertyUpdater.updateProps(this, viewToUpdate, props);
     onAfterUpdateTransaction(viewToUpdate);
   }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/annotations/BUCK b/ReactAndroid/src/main/java/com/facebook/react/uimanager/annotations/BUCK
@@ -3,6 +3,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "rn_android_libra
 rn_android_library(
     name = "annotations",
     srcs = glob(["*.java"]),
+    required_for_source_only_abi = True,
     visibility = [
         "PUBLIC",
     ],
diff --git a/ReactAndroid/src/main/java/com/facebook/react/v8executor/BUCK b/ReactAndroid/src/main/java/com/facebook/react/v8executor/BUCK
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextShadowNode.java
@@ -115,7 +115,6 @@ public long measure(
               if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
                 builder.setJustificationMode(mJustificationMode);
               }
-
               if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
                   builder.setUseLineSpacingFromFallbacks(true);
               }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextView.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextView.java
@@ -12,7 +12,6 @@
 import android.os.Build;
 import androidx.appcompat.widget.AppCompatTextView;
 import androidx.appcompat.widget.TintContextWrapper;
-
 import android.text.Layout;
 import android.text.Spannable;
 import android.text.Spanned;
diff --git a/ReactAndroid/src/main/jni/Application.mk b/ReactAndroid/src/main/jni/Application.mk
@@ -31,6 +31,4 @@ APP_CFLAGS := -Wall -Werror -fexceptions -frtti
 APP_CPPFLAGS := -std=c++1y
 APP_LDFLAGS := -Wl,--build-id
 
-NDK_TOOLCHAIN_VERSION := clang
-
-APP_ALLOW_MISSING_DEPS := true
+NDK_TOOLCHAIN_VERSION := clang
diff --git a/ReactAndroid/src/main/jni/first-party/fb/Android.mk b/ReactAndroid/src/main/jni/first-party/fb/Android.mk
@@ -30,7 +30,6 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include
 
 LOCAL_CFLAGS := -DLOG_TAG=\"libfb\" -DDISABLE_CPUCAP -DDISABLE_XPLAT -fexceptions -frtti
-
 # include/utils/threads.h has unused parameters
 LOCAL_CFLAGS += -Wno-unused-parameter
 ifeq ($(TOOLCHAIN_PERMISSIVE),true)
diff --git a/ReactAndroid/src/main/jni/first-party/yogajni/Android.mk b/ReactAndroid/src/main/jni/first-party/yogajni/Android.mk
@@ -15,7 +15,7 @@ LOCAL_SRC_FILES := \
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/jni
 
-LOCAL_CFLAGS += -fvisibility=hidden -frtti -fexceptions -O3
+LOCAL_CFLAGS += -fvisibility=hidden -fexceptions -frtti -O3
 
 LOCAL_LDLIBS += -landroid -llog
 LOCAL_STATIC_LIBRARIES := libyogacore
diff --git a/ReactAndroid/src/main/jni/first-party/yogajni/BUCK b/ReactAndroid/src/main/jni/first-party/yogajni/BUCK
@@ -12,7 +12,6 @@ oss_cxx_library(
         "-Werror",
         "-O3",
         "-std=c++11",
-        '-DANDROIDPLAT',
     ],
     soname = "libyoga.$(ext)",
     visibility = ["PUBLIC"],
diff --git a/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.h b/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.h
@@ -46,8 +46,6 @@ class CatalystInstanceImpl : public jni::HybridClass<CatalystInstanceImpl> {
 
   CatalystInstanceImpl();
 
-  static bool isIndexedRAMBundle(const char *sourcePath);
-
   void createModuleRegistry(
      jni::alias_ref<JavaMessageQueueThread::javaobject> nativeModulesQueue,
      jni::alias_ref<jni::JCollection<JavaModuleWrapper::javaobject>::javaobject> javaModules,
diff --git a/ReactAndroid/src/main/jni/third-party/jsc/Android.mk b/ReactAndroid/src/main/jni/third-party/jsc/Android.mk
@@ -3,4 +3,4 @@ include $(CLEAR_VARS)
 LOCAL_MODULE:= jsc
 LOCAL_SRC_FILES := jni/$(TARGET_ARCH_ABI)/libjsc.so
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
-include $(PREBUILT_SHARED_LIBRARY)
+include $(PREBUILT_SHARED_LIBRARY)
diff --git a/ReactCommon/cxxreact/Instance.cpp b/ReactCommon/cxxreact/Instance.cpp
@@ -57,7 +57,7 @@ void Instance::initializeBridge(
 
   jsQueue->runOnQueueSync([this, delegate, &jsef, jsQueue]() mutable {
     nativeToJsBridge_ = folly::make_unique<NativeToJsBridge>(
-        jsef.get(), delegate, moduleRegistry_, jsQueue, callback_, jseConfigParams_);
+        jsef.get(), delegate, moduleRegistry_, jsQueue, callback_);
 
     std::lock_guard<std::mutex> lock(m_syncMutex);
     m_syncReady = true;
@@ -68,23 +68,25 @@ void Instance::initializeBridge(
 }
 
 void Instance::loadApplication(std::unique_ptr<RAMBundleRegistry> bundleRegistry,
-                               std::unique_ptr<const JSBigString> bundle,
-                               std::string bundleURL) { // TODO(OSS Candidate ISS#2710739)
+                               std::unique_ptr<const JSBigString> string,
+                               std::string sourceURL) {
   callback_->incrementPendingJSCalls();
-  SystraceSection s("Instance::loadApplication", "bundleURL", bundleURL);
-  nativeToJsBridge_->loadApplication(
-      std::move(bundleRegistry), std::move(bundle), std::move(bundleURL));
+  SystraceSection s("Instance::loadApplication", "sourceURL",
+                    sourceURL);
+  nativeToJsBridge_->loadApplication(std::move(bundleRegistry), std::move(string),
+                                     std::move(sourceURL));
 }
 
 void Instance::loadApplicationSync(std::unique_ptr<RAMBundleRegistry> bundleRegistry,
-                                   std::unique_ptr<const JSBigString> bundle,
-                                   std::string bundleURL) {
+                                   std::unique_ptr<const JSBigString> string,
+                                   std::string sourceURL) {
   std::unique_lock<std::mutex> lock(m_syncMutex);
   m_syncCV.wait(lock, [this] { return m_syncReady; });
 
-  SystraceSection s("Instance::loadApplicationSync", "bundleURL", bundleURL);
-  nativeToJsBridge_->loadApplicationSync(
-      std::move(bundleRegistry), std::move(bundle), std::move(bundleURL));
+  SystraceSection s("Instance::loadApplicationSync", "sourceURL",
+                    sourceURL);
+  nativeToJsBridge_->loadApplicationSync(std::move(bundleRegistry), std::move(string),
+                                         std::move(sourceURL));
 }
 
 void Instance::setSourceURL(std::string sourceURL) {
@@ -94,14 +96,15 @@ void Instance::setSourceURL(std::string sourceURL) {
   nativeToJsBridge_->loadApplication(nullptr, nullptr, std::move(sourceURL));
 }
 
-void Instance::loadScriptFromString(std::unique_ptr<const JSBigString> bundleString,
-                                    std::string bundleURL, // TODO(OSS Candidate ISS#2710739)
+void Instance::loadScriptFromString(std::unique_ptr<const JSBigString> string,
+                                    std::string sourceURL,
                                     bool loadSynchronously) {
-  SystraceSection s("Instance::loadScriptFromString", "bundleURL", bundleURL); // TODO(OSS Candidate ISS#2710739)
+  SystraceSection s("Instance::loadScriptFromString", "sourceURL",
+                    sourceURL);
   if (loadSynchronously) {
-    loadApplicationSync(nullptr, std::move(bundleString), std::move(bundleURL));
+    loadApplicationSync(nullptr, std::move(string), std::move(sourceURL));
   } else {
-    loadApplication(nullptr, std::move(bundleString), std::move(bundleURL));
+    loadApplication(nullptr, std::move(string), std::move(sourceURL));
   }
 }
 
diff --git a/ReactCommon/cxxreact/Instance.h b/ReactCommon/cxxreact/Instance.h
@@ -52,20 +52,18 @@ class RN_EXPORT Instance {
 public:
   virtual ~Instance();
 
-  virtual void setModuleRegistry(std::shared_ptr<ModuleRegistry> moduleRegistry);
+  void setModuleRegistry(std::shared_ptr<ModuleRegistry> moduleRegistry);
 
-  virtual void initializeBridge(std::unique_ptr<InstanceCallback> callback,
+  void initializeBridge(std::unique_ptr<InstanceCallback> callback,
                         std::shared_ptr<ExecutorDelegateFactory> edf, // if nullptr, will use default delegate (JsToNativeBridge) // TODO(OSS Candidate ISS#2710739)
                         std::shared_ptr<JSExecutorFactory> jsef,
                         std::shared_ptr<MessageQueueThread> jsQueue,
                         std::shared_ptr<ModuleRegistry> moduleRegistry);
 
   void setSourceURL(std::string sourceURL);
 
-  virtual void loadScriptFromString(
-      std::unique_ptr<const JSBigString> bundleString,
-      std::string bundleURL,
-      bool loadSynchronously);
+  void loadScriptFromString(std::unique_ptr<const JSBigString> string,
+                            std::string sourceURL, bool loadSynchronously);
   static bool isIndexedRAMBundle(const char *sourcePath);
   static bool isIndexedRAMBundle(std::unique_ptr<const JSBigString>* string);
   void loadRAMBundleFromString(std::unique_ptr<const JSBigString> script, const std::string& sourceURL);
@@ -105,12 +103,12 @@ class RN_EXPORT Instance {
 
 private:
   void callNativeModules(folly::dynamic &&calls, bool isEndOfBatch);
-  virtual void loadApplication(std::unique_ptr<RAMBundleRegistry> bundleRegistry,
-                       std::unique_ptr<const JSBigString> bundle,
-                       std::string bundleURL);
-  virtual void loadApplicationSync(std::unique_ptr<RAMBundleRegistry> bundleRegistry,
-                           std::unique_ptr<const JSBigString> bundle,
-                           std::string bundleURL);
+  void loadApplication(std::unique_ptr<RAMBundleRegistry> bundleRegistry,
+                       std::unique_ptr<const JSBigString> startupScript,
+                       std::string startupScriptSourceURL);
+  void loadApplicationSync(std::unique_ptr<RAMBundleRegistry> bundleRegistry,
+                           std::unique_ptr<const JSBigString> startupScript,
+                           std::string startupScriptSourceURL);
 
   std::shared_ptr<InstanceCallback> callback_;
   std::unique_ptr<NativeToJsBridge> nativeToJsBridge_;
diff --git a/ReactCommon/cxxreact/JSBigString.cpp b/ReactCommon/cxxreact/JSBigString.cpp
diff --git a/ReactCommon/cxxreact/JSBigString.h b/ReactCommon/cxxreact/JSBigString.h
diff --git a/ReactCommon/cxxreact/JSExecutor.h b/ReactCommon/cxxreact/JSExecutor.h
diff --git a/ReactCommon/cxxreact/MethodCall.cpp b/ReactCommon/cxxreact/MethodCall.cpp
diff --git a/ReactCommon/cxxreact/ModuleRegistry.h b/ReactCommon/cxxreact/ModuleRegistry.h
diff --git a/ReactCommon/cxxreact/NativeToJsBridge.cpp b/ReactCommon/cxxreact/NativeToJsBridge.cpp
diff --git a/ReactCommon/cxxreact/NativeToJsBridge.h b/ReactCommon/cxxreact/NativeToJsBridge.h
diff --git a/ReactCommon/yoga/BUCK b/ReactCommon/yoga/BUCK

Original file line number	Diff line number	Diff line change
`@@ -372,4 +372,4 @@ dependencies {`
`372`	`372`	`androidTestImplementation("org.mockito:mockito-core:${MOCKITO_CORE_VERSION}")`
`373`	`373`	`}`
`374`	`374`
`375`		`-apply(from: "release.gradle")`
	`375`	`+apply(from: "release.gradle")`
Original file line number	Diff line number	Diff line change
`@@ -33,4 +33,4 @@ public JavaScriptExecutor create() throws Exception {`
`33`	`33`	`public String toString() {`
`34`	`34`	`return "JSIExecutor+JSCRuntime";`
`35`	`35`	`}`
`36`		`-}`
	`36`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,6 @@ public abstract class ViewManager<T extends View, C extends ReactShadowNode>`
`43`	`43`	`* @param props`
`44`	`44`	`*/`
`45`	`45`	`public void updateProperties(@Nonnull T viewToUpdate, ReactStylesDiffMap props) {`
`46`		`-`
`47`	`46`	`ViewManagerPropertyUpdater.updateProps(this, viewToUpdate, props);`
`48`	`47`	`onAfterUpdateTransaction(viewToUpdate);`
`49`	`48`	`}`