diff --git a/RNTester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterApplication.java b/RNTester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterApplication.java
index 4d23c496aee2..1ce0ba95da77 100644
--- a/RNTester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterApplication.java
+++ b/RNTester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterApplication.java
@@ -21,7 +21,6 @@
 import com.facebook.react.bridge.ReactMarkerConstants;
 import com.facebook.react.shell.MainReactPackage;
 import com.facebook.react.v8executor.V8ExecutorFactory;
-import com.facebook.react.jscexecutor.JSCExecutorFactory;
 import com.facebook.react.views.text.ReactFontManager;
 
 
@@ -73,30 +72,6 @@ public List<ReactPackage> getPackages() {
         new MainReactPackage()
       );
     }
-
-    @Override
-    public JavaScriptExecutorFactory getJavaScriptExecutorFactory() {
-      ReactMarker.addListener(new RNTesterReactMarker());
-      // We use the name of the device and the app for debugging & metrics
-      String appName = getPackageName();
-      String deviceName = getFriendlyDeviceName();
-
-      File jseDir = getApplicationContext().getDir("jse", Context.MODE_PRIVATE);
-      File jsDataStore = new File(jseDir, JSE_CACHING_DIRECTORY_NAME);
-      String jseCacheDirectoryPath = "";
-      if ((jsDataStore.exists() && jsDataStore.isDirectory()) || jsDataStore.mkdirs()) {
-        jseCacheDirectoryPath = jsDataStore.getAbsolutePath();
-      }
-      if(BuildConfig.JS_ENGINE_USED.equals("V8")){
-        return new V8ExecutorFactory(appName, deviceName, new V8ExecutorFactory.V8ConfigParams(jseCacheDirectoryPath, V8ExecutorFactory.V8ConfigParams.CacheType.CodeCache, false));
-      }
-      else if(BuildConfig.JS_ENGINE_USED.equals("JSC")){
-        return new JSCExecutorFactory(appName, deviceName);
-      }
-      else{
-        return null;
-      }
-    }
   };
 
   @Override
diff --git a/ReactAndroid/ReactAndroid.nuspec b/ReactAndroid/ReactAndroid.nuspec
index 9fc15d113447..7cfdf6e973fa 100644
--- a/ReactAndroid/ReactAndroid.nuspec
+++ b/ReactAndroid/ReactAndroid.nuspec
@@ -37,11 +37,6 @@
     <file src="build\react-ndk\all\x86\libjsinspector.so" target="lib\droidx86"/>
     <file src="build\react-ndk\all\arm64-v8a\libjsinspector.so" target="lib\droidarm64"/>
 
-    <file src="build\react-ndk\all\x86_64\libprivatedata.so" target="lib\droidx64"/>
-    <file src="build\react-ndk\all\armeabi-v7a\libprivatedata.so" target="lib\droidarm"/>
-    <file src="build\react-ndk\all\x86\libprivatedata.so" target="lib\droidx86"/>
-    <file src="build\react-ndk\all\arm64-v8a\libprivatedata.so" target="lib\droidarm64"/>
-
     <file src="build\react-ndk\all\x86_64\libreactnativejni.so" target="lib\droidx64"/>
     <file src="build\react-ndk\all\armeabi-v7a\libreactnativejni.so" target="lib\droidarm"/>
     <file src="build\react-ndk\all\x86\libreactnativejni.so" target="lib\droidx86"/>
@@ -88,11 +83,6 @@
     <file src="build\tmp\buildReactNdkLib\local\x86\libjsinspector.so" target="lib\droidx86\unstripped"/>
     <file src="build\tmp\buildReactNdkLib\local\arm64-v8a\libjsinspector.so" target="lib\droidarm64\unstripped"/>
 
-    <file src="build\tmp\buildReactNdkLib\local\x86_64\libprivatedata.so" target="lib\droidx64\unstripped"/>
-    <file src="build\tmp\buildReactNdkLib\local\armeabi-v7a\libprivatedata.so" target="lib\droidarm\unstripped"/>
-    <file src="build\tmp\buildReactNdkLib\local\x86\libprivatedata.so" target="lib\droidx86\unstripped"/>
-    <file src="build\tmp\buildReactNdkLib\local\arm64-v8a\libprivatedata.so" target="lib\droidarm64\unstripped"/>
-
     <file src="build\tmp\buildReactNdkLib\local\x86_64\libreactnativejni.so" target="lib\droidx64\unstripped"/>
     <file src="build\tmp\buildReactNdkLib\local\armeabi-v7a\libreactnativejni.so" target="lib\droidarm\unstripped"/>
     <file src="build\tmp\buildReactNdkLib\local\x86\libreactnativejni.so" target="lib\droidx86\unstripped"/>
@@ -124,7 +114,6 @@
     <file src="..\ReactCommon\yoga\yoga\**\*.h" target="inc\Yoga"/>
     <file src="..\folly\**\*.*" target="inc" />
     <file src="..\glog\src\glog\*.h" target="inc\glog" />
-    <file src="..\ReactCommon\privatedata\PrivateDataBase.h" target="inc\privatedata" />
     <file src="..\jsc\jsc-headers\*.h" target="inc\jsc"/>
   </files>
 </package>
diff --git a/ReactAndroid/build.gradle b/ReactAndroid/build.gradle
index ebec4331499e..951a2f255d2c 100644
--- a/ReactAndroid/build.gradle
+++ b/ReactAndroid/build.gradle
@@ -40,13 +40,8 @@ def boostPath = dependenciesPath ?: System.getenv("REACT_NATIVE_BOOST_PATH") ?:
 def DoubleConversionPath = '../double-conversion'
 def FollyPath = '..'
 def GlogPath = '..'
-def JSCPath = '../jsc'
 def V8Path = 'packages/ReactNative.V8.Android.7.0.276.32-v1'
 
-
-// Set the value of JSEngineUsed as 'V8' or 'JSC' to enable the respective engine
-def JSEngineUsed = 'V8'
-
 task createNativeDepsDirectories {
     downloadsDir.mkdirs()
     thirdPartyNdkDir.mkdirs()
@@ -130,34 +125,30 @@ task prepareGlog(dependsOn: createNativeDepsDirectories, type: Copy) {
 
 // Create Android.mk library module based on jsc from npm
 task prepareJSC {
-	if (JSEngineUsed=='JSC'){
-		doLast {
-			def jscPackageRoot = file("$projectDir/../node_modules/jsc-android/dist")
-			if (!jscPackageRoot.exists()) {
-				// For an app to build from RN source, the jsc-android is located at /path/to/app/node_modules
-				// and $projectDir may located at /path/to/app/node_modules/react-native/ReactAndroid
-				jscPackageRoot = file("$projectDir/../../jsc-android/dist")
-			}
-			def jscAAR = fileTree(jscPackageRoot).matching({ it.include "**/android-jsc/**/*.aar" }).singleFile
-			def soFiles = zipTree(jscAAR).matching({ it.include "**/*.so" })
-
-			def headerFiles = fileTree(jscPackageRoot).matching({ it.include "**/include/*.h" })
-
-			copy {
-				from(soFiles)
-				from(headerFiles)
-				from("src/main/jni/third-party/jsc/Android.mk")
-
-				filesMatching("**/*.h", { it.path = "JavaScriptCore/${it.name}" })
-
-				includeEmptyDirs(false)
-				into("$thirdPartyNdkDir/jsc")
-
-			}
-		}
-	}
-}
+    doLast {
+        def jscPackageRoot = file("$projectDir/../node_modules/jsc-android/dist")
+        if (!jscPackageRoot.exists()) {
+            // For an app to build from RN source, the jsc-android is located at /path/to/app/node_modules
+            // and $projectDir may located at /path/to/app/node_modules/react-native/ReactAndroid
+            jscPackageRoot = file("$projectDir/../../jsc-android/dist")
+        }
+        def jscAAR = fileTree(jscPackageRoot).matching({ it.include "**/android-jsc/**/*.aar" }).singleFile
+        def soFiles = zipTree(jscAAR).matching({ it.include "**/*.so" })
+
+        def headerFiles = fileTree(jscPackageRoot).matching({ it.include "**/include/*.h" })
 
+        copy {
+            from(soFiles)
+            from(headerFiles)
+            from("src/main/jni/third-party/jsc/Android.mk")
+
+            filesMatching("**/*.h", { it.path = "JavaScriptCore/${it.name}" })
+
+            includeEmptyDirs(false)
+            into("$thirdPartyNdkDir/jsc")
+        }
+    }
+}
 task downloadNdkBuildDependencies {
     if (!boostPath) {
         dependsOn(downloadBoost)
@@ -225,7 +216,7 @@ def getNdkBuildFullPath() {
     return ndkBuildFullPath
 }
 
-task buildReactNdkLib(dependsOn: [prepareJSC, prepareBoost, prepareDoubleConversion, prepareFolly, prepareGlog], type: Exec) {
+task buildReactNdkLib(dependsOn: [prepareBoost, prepareDoubleConversion, prepareFolly, prepareGlog], type: Exec) {
     inputs.dir("$projectDir/../ReactCommon")
     inputs.dir("src/main/jni")
     outputs.dir("$buildDir/react-ndk/all")
@@ -239,9 +230,8 @@ task buildReactNdkLib(dependsOn: [prepareJSC, prepareBoost, prepareDoubleConvers
             "V8_NUGET_DIR=$projectDir/$V8Path",
             "REACT_COMMON_DIR=$projectDir/../ReactCommon",
             "REACT_SRC_DIR=$projectDir/src/main/java/com/facebook/react",
-            "JS_ENGINE=$JSEngineUsed",
-            '-C', file("src/main/jni/react/jni").absolutePath,
-            '--jobs', project.findProperty("jobs") ?: Runtime.runtime.availableProcessors()
+            "-C", file("src/main/jni/react/jni").absolutePath,
+            "--jobs", project.findProperty("jobs") ?: Runtime.runtime.availableProcessors()
     )
 }
 
@@ -302,7 +292,6 @@ android {
         }
 
         buildConfigField("boolean", "IS_INTERNAL_BUILD", "false")
-        buildConfigField("String", "JS_ENGINE_USED", "\"$JSEngineUsed\"")
         buildConfigField("int", "EXOPACKAGE_FLAGS", "0")
 
         resValue "integer", "react_native_dev_server_port", reactNativeDevServerPort()
diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManagerBuilder.java b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManagerBuilder.java
index d9fe2b260156..4865ca7a07cf 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManagerBuilder.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManagerBuilder.java
@@ -11,7 +11,6 @@
 import android.app.Application;
 import com.facebook.infer.annotation.Assertions;
 import com.facebook.react.bridge.JSBundleLoader;
-import com.facebook.react.bridge.JSCJavaScriptExecutorFactory;
 import com.facebook.react.bridge.JSIModulePackage;
 import com.facebook.react.bridge.JavaScriptExecutorFactory;
 import com.facebook.react.bridge.NativeModuleCallExceptionHandler;
@@ -22,6 +21,7 @@
 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;
 import com.facebook.react.uimanager.UIImplementationProvider;
@@ -276,7 +276,7 @@ public ReactInstanceManager build() {
         mCurrentActivity,
         mDefaultHardwareBackBtnHandler,
         mJavaScriptExecutorFactory == null
-            ? new JSCJavaScriptExecutorFactory(appName, deviceName)
+            ? new V8ExecutorFactory(appName, deviceName)
             : mJavaScriptExecutorFactory,
         (mJSBundleLoader == null && mJSBundleAssetUrl != null)
             ? JSBundleLoader.createAssetLoader(
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactBridge.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactBridge.java
index 2a60aceccc24..789f9ba326aa 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactBridge.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactBridge.java
@@ -13,45 +13,26 @@
 import com.facebook.soloader.SoLoader;
 import com.facebook.systrace.Systrace;
 
-import com.facebook.react.BuildConfig;
-
 public class ReactBridge {
   private static volatile long sLoadStartTime = 0;
   private static volatile long sLoadEndTime = 0;
 
   private static boolean sDidInit = false;
-
-  // Office implementation of RN can work with two JS Engines: V8 and JSC.
-  // There is a compile time flag to decide which one will be used and V8 is the default one.
-  // We are exposing an API from ReactBridge so that consumer can choose JSC if required.
-  private static boolean sUseJSC = false;
-
-  public static void staticInit() {
+  public synchronized static void staticInit() {
     if (sDidInit) {
       return;
     }
     sDidInit = true;
 
-    if(BuildConfig.JS_ENGINE_USED.equals("JSC")){
-      sUseJSC = true;
-    }
-
     sLoadStartTime = SystemClock.uptimeMillis();
     Systrace.beginSection(TRACE_TAG_REACT_JAVA_BRIDGE, "ReactBridge.staticInit::load:reactnativejni");
     ReactMarker.logMarker(ReactMarkerConstants.LOAD_REACT_NATIVE_SO_FILE_START);
 
-    if (sUseJSC) {
-      SoLoader.loadLibrary("icu_common");
-      SoLoader.loadLibrary("jsc");
-    }
-    else {
-      SoLoader.loadLibrary("v8_libbase.cr");
-      SoLoader.loadLibrary("v8_libplatform.cr");
-      SoLoader.loadLibrary("v8.cr");
-    }
+    SoLoader.loadLibrary("v8_libbase.cr");
+    SoLoader.loadLibrary("v8_libplatform.cr");
+    SoLoader.loadLibrary("v8.cr");
 
     SoLoader.loadLibrary("glog_init");
-    SoLoader.loadLibrary("privatedata");
     SoLoader.loadLibrary("fb");
     SoLoader.loadLibrary("yoga");
     SoLoader.loadLibrary("reactnativejni");
diff --git a/ReactAndroid/src/main/jni/react/jni/Android.mk b/ReactAndroid/src/main/jni/react/jni/Android.mk
index d9f03d18900a..264e08cd3731 100644
--- a/ReactAndroid/src/main/jni/react/jni/Android.mk
+++ b/ReactAndroid/src/main/jni/react/jni/Android.mk
@@ -17,17 +17,15 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)
 #   ./../ == react
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../..
 
-
 LOCAL_CFLAGS += -fexceptions -frtti -Wno-unused-lambda-capture
 
 LOCAL_LDLIBS += -landroid
 
 # The dynamic libraries (.so files) that this module depends on.
-
-LOCAL_SHARED_LIBRARIES := libfolly_json libfb libglog_init libyoga libprivatedata
+LOCAL_SHARED_LIBRARIES := libfolly_json libfb libglog_init libyoga
 
 # The static libraries (.a files) that this module depends on.
-LOCAL_STATIC_LIBRARIES := libreactnative jsi libjscallinvokerholder
+LOCAL_STATIC_LIBRARIES := libreactnative libjscallinvokerholder
 
 # Name of this module.
 #
@@ -35,39 +33,8 @@ LOCAL_STATIC_LIBRARIES := libreactnative jsi libjscallinvokerholder
 # LOCAL_SHARED_LIBRARIES variable.
 LOCAL_MODULE := reactnativejni
 
-LOCAL_SRC_FILES := \
-  CatalystInstanceImpl.cpp \
-  CxxModuleWrapper.cpp \
-  JavaModuleWrapper.cpp \
-  JReactMarker.cpp \
-  JSLogging.cpp \
-  JMessageQueueThread.cpp \
-  JSLoader.cpp \
-  JniJSModulesUnbundle.cpp \
-  MethodInvoker.cpp \
-  ModuleRegistryBuilder.cpp \
-  NativeArray.cpp \
-  NativeCommon.cpp \
-  NativeDeltaClient.cpp \
-  NativeMap.cpp \
-  OnLoad.cpp \
-  ProxyExecutor.cpp \
-  ReadableNativeArray.cpp \
-  ReadableNativeMap.cpp \
-  WritableNativeArray.cpp \
-  WritableNativeMap.cpp \
-
-LOCAL_V8_FILES := \
-  InstanceManager.cpp \
-  AndroidV8Factory.cpp
-  
-ifeq ($(JS_ENGINE), V8)
-  LOCAL_SRC_FILES += $(LOCAL_V8_FILES)
-  LOCAL_STATIC_LIBRARIES += v8runtime
-else ifeq ($(JS_ENGINE), JSC)
-  LOCAL_SHARED_LIBRARIES += libjsc
-  LOCAL_STATIC_LIBRARIES += jscruntime
-endif
+# Compile all local c++ files.
+LOCAL_SRC_FILES := $(wildcard *.cpp)
 
 # Build the files in this directory as a shared library
 include $(BUILD_SHARED_LIBRARY)
@@ -84,16 +51,11 @@ include $(BUILD_SHARED_LIBRARY)
 #   Whenever you encounter an include <dir>/<module-dir>/Android.mk, you
 #   tell andorid-ndk to compile the module in <dir>/<module-dir> according
 #   to the specification inside <dir>/<module-dir>/Android.mk.
-
-$(call import-module,cxxreact)
-$(call import-module,privatedata)
+$(call import-module,folly)
 $(call import-module,fb)
 $(call import-module,fbgloginit)
-$(call import-module,folly)
-ifeq ($(JS_ENGINE), JSC)
-  $(call import-module,jsc)
-endif
 $(call import-module,yogajni)
+$(call import-module,cxxreact)
 $(call import-module,jsi)
 $(call import-module,jsiexecutor)
 $(call import-module,jscallinvoker)
@@ -103,9 +65,4 @@ include $(REACT_SRC_DIR)/turbomodule/core/jni/Android.mk
 # TODO(ramanpreet):
 #   Why doesn't this import-module call generate a jscexecutor.so file?
 # $(call import-module,jscexecutor)
-
-ifeq ($(JS_ENGINE), JSC)
-  include $(REACT_SRC_DIR)/jscexecutor/Android.mk
-else ifeq ($(JS_ENGINE), V8)
-  include $(REACT_SRC_DIR)/v8executor/Android.mk
-endif
\ No newline at end of file
+include $(REACT_SRC_DIR)/v8executor/Android.mk
\ No newline at end of file
diff --git a/ReactAndroid/src/main/jni/react/jni/AndroidJSCFactory.cpp b/ReactAndroid/src/main/jni/react/jni/AndroidJSCFactory.cpp
deleted file mode 100644
index e2b38d6ef620..000000000000
--- a/ReactAndroid/src/main/jni/react/jni/AndroidJSCFactory.cpp
+++ /dev/null
@@ -1,125 +0,0 @@
-// Copyright (c) 2004-present, Facebook, Inc.
-
-// This source code is licensed under the MIT license found in the
-// LICENSE file in the root directory of this source tree.
-
-#include <cxxreact/JSCExecutor.h>
-
-#include <string>
-
-#include <cxxreact/Platform.h>
-#include <fb/fbjni.h>
-#include <folly/Conv.h>
-#include <folly/dynamic.h>
-#include <folly/Memory.h>
-#include <jschelpers/JSCHelpers.h>
-
-#include "JSCPerfLogging.h"
-#include "JSLogging.h"
-#include "JReactMarker.h"
-
-using namespace facebook::jni;
-
-namespace facebook {
-namespace react {
-
-namespace {
-
-ExceptionHandling::ExtractedEror extractJniError(const std::exception& ex, const char *context) {
-  auto jniEx = dynamic_cast<const jni::JniException *>(&ex);
-  if (!jniEx) {
-    return {};
-  }
-
-  auto stackTrace = jniEx->getThrowable()->getStackTrace();
-  std::ostringstream stackStr;
-  for (int i = 0, count = stackTrace->size(); i < count; ++i) {
-    auto frame = stackTrace->getElement(i);
-
-    auto methodName = folly::to<std::string>(frame->getClassName(), ".",
-      frame->getMethodName());
-
-    // Cut off stack traces at the Android looper, to keep them simple
-    if (methodName == "android.os.Looper.loop") {
-      break;
-    }
-
-    stackStr << std::move(methodName) << '@' << frame->getFileName();
-    if (frame->getLineNumber() > 0) {
-      stackStr << ':' << frame->getLineNumber();
-    }
-    stackStr << std::endl;
-  }
-
-  auto msg = folly::to<std::string>("Java exception in '", context, "'\n\n", jniEx->what());
-  return {.message = msg, .stack = stackStr.str()};
-}
-
-JSValueRef nativePerformanceNow(
-    JSContextRef ctx,
-    JSObjectRef function,
-    JSObjectRef thisObject,
-    size_t argumentCount,
-    const JSValueRef arguments[], JSValueRef *exception) {
-  static const int64_t NANOSECONDS_IN_SECOND = 1000000000LL;
-  static const int64_t NANOSECONDS_IN_MILLISECOND = 1000000LL;
-
-  // Since SystemClock.uptimeMillis() is commonly used for performance measurement in Java
-  // and uptimeMillis() internally uses clock_gettime(CLOCK_MONOTONIC),
-  // we use the same API here.
-  // We need that to make sure we use the same time system on both JS and Java sides.
-  // Links to the source code:
-  // https://android.googlesource.com/platform/frameworks/native/+/jb-mr1-release/libs/utils/SystemClock.cpp
-  // https://android.googlesource.com/platform/system/core/+/master/libutils/Timers.cpp
-  struct timespec now;
-  clock_gettime(CLOCK_MONOTONIC, &now);
-  int64_t nano = now.tv_sec * NANOSECONDS_IN_SECOND + now.tv_nsec;
-  return Value::makeNumber(ctx, (nano / (double)NANOSECONDS_IN_MILLISECOND));
-}
-
-JSValueRef nativeLoggingHook(
-  JSContextRef ctx,
-  JSObjectRef function,
-  JSObjectRef thisObject,
-  size_t argumentCount,
-  const JSValueRef arguments[],
-  JSValueRef* exception) {
-  android_LogPriority logLevel = ANDROID_LOG_DEBUG;
-  if (argumentCount > 1) {
-    int level = (int)Value(ctx, arguments[1]).asNumber();
-    // The lowest log level we get from JS is 0. We shift and cap it to be
-    // in the range the Android logging method expects.
-    logLevel = std::min(
-      static_cast<android_LogPriority>(level + ANDROID_LOG_DEBUG),
-      ANDROID_LOG_FATAL);
-  }
-  if (argumentCount > 0) {
-    String message = Value(ctx, arguments[0]).toString();
-    reactAndroidLoggingHook(message.str(), logLevel);
-  }
-  return Value::makeUndefined(ctx);
-}
-
-}
-
-namespace detail {
-
-void injectJSExecutorAndroidPlatform() {
-  // Inject some behavior into react/
-  JReactMarker::setLogPerfMarkerIfNeeded();
-  ExceptionHandling::platformErrorExtractor = extractJniError;
-  JSCNativeHooks::loggingHook = nativeLoggingHook;
-  JSCNativeHooks::nowHook = nativePerformanceNow;
-  JSCNativeHooks::installPerfHooks = addNativePerfLoggingHooks;
-}
-
-}
-
-std::unique_ptr<JSExecutorFactory> makeAndroidJSCExecutorFactory(
-    const folly::dynamic& jscConfig) {
-  detail::injectJSCExecutorAndroidPlatform();
-  return folly::make_unique<JSCExecutorFactory>(std::move(jscConfig));
-}
-
-}
-}
\ No newline at end of file
diff --git a/ReactAndroid/src/main/jni/react/jni/AndroidJSCFactory.h b/ReactAndroid/src/main/jni/react/jni/AndroidJSCFactory.h
deleted file mode 100644
index b478986a7fdd..000000000000
--- a/ReactAndroid/src/main/jni/react/jni/AndroidJSCFactory.h
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright (c) 2004-present, Facebook, Inc.
-
-// This source code is licensed under the MIT license found in the
-// LICENSE file in the root directory of this source tree.
-
-#pragma once
-
-#include <memory>
-#include <cxxreact/JSExecutor.h>
-
-namespace folly {
-
-struct dynamic;
-
-}
-
-namespace facebook {
-namespace react {
-
-class JSExecutorFactory;
-
-namespace detail {
-
-// This is only exposed so instrumentation tests can call it.
-void injectJSExecutorAndroidPlatform();
-
-}
-
-std::unique_ptr<JSExecutorFactory> makeAndroidJSCExecutorFactory(
-    const folly::dynamic& jscConfig);
-
-}
-}
\ No newline at end of file
diff --git a/ReactAndroid/src/main/jni/react/jni/AndroidV8Factory.cpp b/ReactAndroid/src/main/jni/react/jni/AndroidV8Factory.cpp
deleted file mode 100644
index bca9f98a74a8..000000000000
--- a/ReactAndroid/src/main/jni/react/jni/AndroidV8Factory.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-#include <string>
-
-#include <cxxreact/V8Executor.h>
-#include <folly/Conv.h>
-#include <folly/dynamic.h>
-#include <folly/Memory.h>
-
-#include "JReactMarker.h"
-
-// using namespace facebook::jni;
-
-namespace facebook {
-namespace react {
-
-namespace detail {
-void injectJSExecutorAndroidPlatform() {
-  // Inject some behavior into react/
-  JReactMarker::setLogPerfMarkerIfNeeded();
- //TODO (VSO:2298684) : AndroidJSCFactory.cpp is doing a lot of things in this api, 
- // we will fill that in aforementioned VSO task.
-}
-}
-
-std::unique_ptr<JSExecutorFactory> makeAndroidJSCExecutorFactory(
-    const folly::dynamic& jscConfig) {
-  detail::injectJSExecutorAndroidPlatform();
-  return folly::make_unique<v8::V8ExecutorFactory>(jscConfig);
-}
-
-}}
\ No newline at end of file
diff --git a/ReactAndroid/src/main/jni/react/jni/InstanceManager.cpp b/ReactAndroid/src/main/jni/react/jni/InstanceManager.cpp
deleted file mode 100644
index fd6643fe7e0c..000000000000
--- a/ReactAndroid/src/main/jni/react/jni/InstanceManager.cpp
+++ /dev/null
@@ -1,102 +0,0 @@
-#include <cxxreact/PlatformBundleInfo.h>
-#include <folly/dynamic.h>
-
-#include "AndroidJSCFactory.h"
-#include "JSLoader.h"
-
-#include "InstanceManager.h"
-
-namespace facebook { namespace react {
-
-struct DefaultInstanceCallback final : public InstanceCallback
-{
-	void onBatchComplete() override {}
-	void incrementPendingJSCalls() override {}
-	void decrementPendingJSCalls() override {}
-};
-
-// If the provided url begins with "/" then it represents a file in file system.
-bool IsJSBundleFilePath(const std::string& bundleUrl)
-{
-	std::size_t index = bundleUrl.find("/");
-	if (index == 0)
-	{
-		return true;
-	}
-
-	return false;
-}
-
-std::shared_ptr<Instance> CreateReactInstance(
-	AAssetManager* assetManager,
-	std::string&& jsBundleFile,
-	std::vector<PlatformBundleInfo>&& platformBundles,
-	std::vector<std::tuple<std::string, facebook::xplat::module::CxxModule::Provider, std::shared_ptr<MessageQueueThread>>>&& cxxModules,
-	std::shared_ptr<MessageQueueThread>&& jsQueue,
-	std::shared_ptr<MessageQueueThread>&& /*nativeQueue*/) noexcept
-{
-	auto instance = std::make_shared<Instance>();
-
-	std::vector<std::unique_ptr<NativeModule>> modules;
-
-	// Add app provided modules.
-	for (auto& cxxModule : cxxModules)
-	{
-		modules.push_back(std::make_unique<CxxNativeModule>(instance,
-			move(std::get<0>(cxxModule)),
-			move(std::get<1>(cxxModule)),
-			move(std::get<2>(cxxModule))));
-	}
-
-	// Empty configuration, this is not getting used in V8 Executor flow.
-	folly::dynamic jscConfig = folly::dynamic::object;
-
-	std::unique_ptr<JSExecutorFactory> jsExecutorFactory{ makeAndroidJSCExecutorFactory(jscConfig) };
-	std::unique_ptr<ModuleRegistry> moduleRegistry{ std::make_unique<ModuleRegistry>(std::move(modules)) };
-
-	// Initialize bridge.
-	instance->initializeBridge(std::make_unique<DefaultInstanceCallback>(),
-		nullptr,
-		std::move(jsExecutorFactory),
-		std::move(jsQueue),
-		std::move(moduleRegistry));
-
-	// Load all required JS scripts.
-
-	// First load platform bundles.
-	for (auto& platformBundle : platformBundles)
-	{
-		if (!platformBundle.BundleUrl.empty())
-		{
-			std::unique_ptr<const JSBigString> script;
-			if (IsJSBundleFilePath(platformBundle.BundleUrl))
-			{
-				// Load from file system.
-				script = JSBigFileString::fromPath(platformBundle.BundleUrl);
-			}
-			else
-			{
-				// Load from Assets.
-				script = loadScriptFromAssets(assetManager, platformBundle.BundleUrl);
-			}
-			instance->loadScriptFromString(std::move(script), std::move(platformBundle.BundleUrl), true /*synchronously*/);
-		}
-	}
-
-	// Now load user bundle.
-	std::unique_ptr<const JSBigString> script;
-	if (IsJSBundleFilePath(jsBundleFile))
-	{
-		// Load from file system.
-		script = JSBigFileString::fromPath(jsBundleFile);
-	}
-	else
-	{
-		// Load from Assets.
-		script = loadScriptFromAssets(assetManager, jsBundleFile);
-	}
-	instance->loadScriptFromString(std::move(script), jsBundleFile, false);
-	return instance;
-}
-
-}}//namespace facebook::react
diff --git a/ReactAndroid/src/main/jni/react/jni/InstanceManager.h b/ReactAndroid/src/main/jni/react/jni/InstanceManager.h
deleted file mode 100644
index f7f9871193b1..000000000000
--- a/ReactAndroid/src/main/jni/react/jni/InstanceManager.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#pragma once
-#include <string>
-
-#include <android/asset_manager_jni.h>
-#include <cxxreact/CxxNativeModule.h>
-#include <cxxreact/Instance.h>
-#include <fb/fbjni.h>
-#include <folly/Memory.h>
-
-namespace facebook { namespace react {
-
-std::shared_ptr<Instance> CreateReactInstance(
-	AAssetManager* assetManager,
-	std::string&& jsBundleFile,
-	std::vector<std::tuple<std::string, facebook::xplat::module::CxxModule::Provider, std::shared_ptr<MessageQueueThread>>>&& cxxModules,
-	std::shared_ptr<MessageQueueThread>&& jsQueue,
-	std::shared_ptr<MessageQueueThread>&& nativeQueue) noexcept;
-
-}} //namespace facebook::react
diff --git a/ReactAndroid/src/main/jni/react/jni/JSLoader.cpp b/ReactAndroid/src/main/jni/react/jni/JSLoader.cpp
index d001f600cfbb..8f18dbc7f806 100644
--- a/ReactAndroid/src/main/jni/react/jni/JSLoader.cpp
+++ b/ReactAndroid/src/main/jni/react/jni/JSLoader.cpp
@@ -45,7 +45,7 @@ std::unique_ptr<const JSBigString> loadScriptFromAssets(
       manager,
       assetName.c_str(),
       AASSET_MODE_STREAMING); // Optimized for sequential read: see AssetManager.java for docs
-    if (asset) { 
+    if (asset) {
       auto buf = folly::make_unique<JSBigBufferString>(AAsset_getLength(asset));
       size_t offset = 0;
       int readbytes;
diff --git a/ReactAndroid/src/main/jni/react/jni/OnLoad.cpp b/ReactAndroid/src/main/jni/react/jni/OnLoad.cpp
index 65583688bd15..c754eb12b162 100644
--- a/ReactAndroid/src/main/jni/react/jni/OnLoad.cpp
+++ b/ReactAndroid/src/main/jni/react/jni/OnLoad.cpp
@@ -11,7 +11,6 @@
 #include <fb/glog_init.h>
 #include <fb/log.h>
 
-#include "AndroidJSCFactory.h"
 #include "CatalystInstanceImpl.h"
 #include "CxxModuleWrapper.h"
 #include "JavaScriptExecutorHolder.h"
@@ -32,27 +31,6 @@ namespace react {
 
 namespace {
 
-// TODO: can we avoid these wrapper classes, and instead specialize the logic in CatalystInstanceImpl
-class JSCJavaScriptExecutorHolder : public HybridClass<JSCJavaScriptExecutorHolder,
-                                                       JavaScriptExecutorHolder> {
- public:
-  static constexpr auto kJavaDescriptor = "Lcom/facebook/react/bridge/JSCJavaScriptExecutor;";
-
-  static local_ref<jhybriddata> initHybrid(alias_ref<jclass>, ReadableNativeMap* jscConfig) {
-    return makeCxxInstance(makeAndroidJSCExecutorFactory(jscConfig->consume()));
-  }
-
-  static void registerNatives() {
-    registerHybrid({
-      makeNativeMethod("initHybrid", JSCJavaScriptExecutorHolder::initHybrid),
-    });
-  }
-
- private:
-  friend HybridBase;
-  using HybridBase::HybridBase;
-};
-
 struct JavaJSExecutor : public JavaClass<JavaJSExecutor> {
   static constexpr auto kJavaDescriptor = "Lcom/facebook/react/bridge/JavaJSExecutor;";
 };
@@ -86,7 +64,6 @@ extern "C" JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
   return initialize(vm, [] {
     gloginit::initialize();
     FLAGS_minloglevel = 0;
-    JSCJavaScriptExecutorHolder::registerNatives();
     ProxyJavaScriptExecutorHolder::registerNatives();
     CatalystInstanceImpl::registerNatives();
     CxxModuleWrapperBase::registerNatives();
diff --git a/ReactCommon/cxxreact/Android.mk b/ReactCommon/cxxreact/Android.mk
index 21231debaabc..e72045c4521b 100644
--- a/ReactCommon/cxxreact/Android.mk
+++ b/ReactCommon/cxxreact/Android.mk
@@ -9,42 +9,18 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := reactnative
 
-LOCAL_SRC_FILES := \
-  CxxNativeModule.cpp \
-  Instance.cpp \
-  JSBigString.cpp \
-  JSBundleType.cpp \
-  JSDeltaBundleClient.cpp \
-  JSExecutor.cpp \
-  JSIndexedRAMBundle.cpp \
-  MethodCall.cpp \
-  ModuleRegistry.cpp \
-  NativeToJsBridge.cpp \
-  Platform.cpp \
-  RAMBundleRegistry.cpp \
-  ReactMarker.cpp \
-
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/..  
+LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/..
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_C_INCLUDES)
 
 LOCAL_CFLAGS := \
   -DLOG_TAG=\"ReactNative\"
 
-LOCAL_CFLAGS += -fexceptions -frtti -Wno-unused-lambda-capture -Wno-unused-variable
+LOCAL_CFLAGS += -fexceptions -frtti -Wno-unused-lambda-capture
 
 LOCAL_STATIC_LIBRARIES := boost jsi
-LOCAL_SHARED_LIBRARIES := jsinspector libfb libfolly_json libglog 
-
-LOCAL_V8_FILES := \
-    File.cpp \
-    V8NativeModules.cpp \
-    V8Executor.cpp 
-    
-ifeq ($(JS_ENGINE), V8)
-  LOCAL_SRC_FILES += $(LOCAL_V8_FILES)
-  LOCAL_STATIC_LIBRARIES := v8helpers
-  LOCAL_SHARED_LIBRARIES += libv8 libv8platform libv8base
-endif
+LOCAL_SHARED_LIBRARIES := jsinspector libfolly_json glog
 
 include $(BUILD_STATIC_LIBRARY)
 
@@ -52,11 +28,4 @@ $(call import-module,fb)
 $(call import-module,folly)
 $(call import-module,glog)
 $(call import-module,jsi)
-$(call import-module,jsinspector)
-$(call import-module,privatedata)
-ifeq ($(JS_ENGINE), V8)
-  $(call import-module,v8)
-  $(call import-module,v8base)
-  $(call import-module,v8helpers) 
-  $(call import-module,v8platform) 
-endif
\ No newline at end of file
+$(call import-module,jsinspector)
\ No newline at end of file
diff --git a/ReactCommon/cxxreact/File.cpp b/ReactCommon/cxxreact/File.cpp
deleted file mode 100644
index e22ef42f7bcd..000000000000
--- a/ReactCommon/cxxreact/File.cpp
+++ /dev/null
@@ -1,134 +0,0 @@
-#include "File.h"
-#include <sstream>
-#include <fstream>
-#include <sys/mman.h>
-#include <assert.h>
-#include <errno.h>
-#include <v8helpers/V8Utils.h>
-
-using namespace std;
-
-namespace rnv8 {
-bool File::Exists(const string& path) {
-    std::ifstream infile(path.c_str());
-    return infile.good();
-}
-string File::ReadText(const string& filePath) {
-    long len;
-    bool isNew;
-    const char* content = ReadText(filePath, len, isNew);
-
-    string s(content, len);
-
-    if (isNew) {
-        delete[] content;
-    }
-
-    return s;
-}
-
-void* File::ReadBinary(const string& filePath, long& length) {
-    length = 0;
-    if (!File::Exists(filePath)) {
-        return nullptr;
-    }
-
-    auto file = fopen(filePath.c_str(), READ_BINARY);
-    if (!file) {
-        ReactMarker::logTaggedMarker(ReactMarker::BYTECODE_READ_FAILED, strerror(errno));
-        return nullptr;
-    }
-
-    if (fseek(file, 0, SEEK_END) == -1) {
-        ReactMarker::logTaggedMarker(ReactMarker::BYTECODE_READ_FAILED, strerror(errno));
-    }
-
-    length = ftell(file);
-    if(length == -1) {
-        ReactMarker::logTaggedMarker(ReactMarker::BYTECODE_READ_FAILED, strerror(errno));
-    }
-
-    rewind(file);
-    uint8_t* data = new uint8_t[length];
-
-    int readBytes = fread(data, sizeof(uint8_t), length, file);
-    if (readBytes != length) {
-        ReactMarker::logTaggedMarker(ReactMarker::BYTECODE_READ_FAILED, strerror(errno));
-    }
-
-    fclose(file);
-
-    return data;
-}
-
-bool File::WriteBinary(const string& filePath, const void* data, long length) {
-    
-	auto file = fopen(filePath.c_str(), WRITE_BINARY);
-	//LOGD("V8Executor::WriteBinary entry %s", filePath.c_str());
-    if (!file) {
-		//LOGD("V8Executor::WriteBinary file is NULL %s", strerror(errno));
-        return false;
-    }
-	//LOGD("V8Executor::WriteBinary after file open ");
-    long writtenBytes = fwrite(data, sizeof(uint8_t), length, file);
-    fclose(file);
-	//LOGD("V8Executor::WriteBinary after file write  ");
-    return writtenBytes == length;
-}
-
-const char* File::ReadText(const string& filePath, long& charLength, bool& isNew) {
-    FILE* file = fopen(filePath.c_str(), "rb");
-    fseek(file, 0, SEEK_END);
-
-    charLength = ftell(file);
-    isNew = charLength > BUFFER_SIZE;
-
-    rewind(file);
-
-    if (isNew) {
-        char* newBuffer = new char[charLength];
-        fread(newBuffer, 1, charLength, file);
-        fclose(file);
-
-        return newBuffer;
-    }
-
-    fread(Buffer, 1, charLength, file);
-    fclose(file);
-
-    return Buffer;
-}
-
-MemoryMappedFile MemoryMappedFile::Open(const char* filePath) {
-    void* memory = nullptr;
-    long length = 0;
-    if (FILE* file = fopen(filePath, "r+")) {
-        if (fseek(file, 0, SEEK_END) == 0) {
-            length = ftell(file);
-            if (length >= 0) {
-                memory = mmap(NULL, length, PROT_READ, MAP_SHARED, fileno(file), 0);
-                if (memory == MAP_FAILED) {
-                    memory = nullptr;
-                }
-            }
-        }
-        fclose(file);
-    }
-    return MemoryMappedFile(memory, length);
-}
-
-MemoryMappedFile::MemoryMappedFile(void* memory, size_t size)
-    :
-    memory(memory), size(size) {
-}
-
-MemoryMappedFile::~MemoryMappedFile() {
-    int result = munmap(this->memory, this->size);
-    assert(result == 0);
-}
-
-char* File::Buffer = new char[BUFFER_SIZE];
-
-const char* File::WRITE_BINARY = "wb";
-const char* File::READ_BINARY = "rb";
-}
diff --git a/ReactCommon/cxxreact/File.h b/ReactCommon/cxxreact/File.h
deleted file mode 100644
index 896e992edb4d..000000000000
--- a/ReactCommon/cxxreact/File.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-#ifndef JNI_FILE_H_
-#define JNI_FILE_H_
-
-#include <string>
-
-namespace rnv8 {
-struct MemoryMappedFile final {
-    static MemoryMappedFile Open(const char* filePath);
-    MemoryMappedFile(void* memory, size_t size);
-    ~MemoryMappedFile();
-
-    void* memory = nullptr;
-    size_t size = 0;
-};
-
-class File {
-    public:
-        static const char* ReadText(const std::string& filePath, long& length, bool& isNew);
-        static std::string ReadText(const std::string& filePath);
-        static bool Exists(const std::string& filePath);
-        static bool WriteBinary(const std::string& filePath, const void* inData, long length);
-        static void* ReadBinary(const std::string& filePath, long& length);
-    private:
-        static const int BUFFER_SIZE = 1024 * 1024;
-        static char* Buffer;
-        static const char* WRITE_BINARY;
-        static const char* READ_BINARY;
-};
-}
-
-#endif /* JNI_FILE_H_ */
diff --git a/ReactCommon/cxxreact/V8Executor.cpp b/ReactCommon/cxxreact/V8Executor.cpp
deleted file mode 100644
index e1092fb44818..000000000000
--- a/ReactCommon/cxxreact/V8Executor.cpp
+++ /dev/null
@@ -1,800 +0,0 @@
-#include <algorithm>
-#include <condition_variable>
-#include <mutex>
-#include <sstream>
-#include <string>
-#include <folly/json.h>
-#include <folly/Exception.h>
-#include <folly/Memory.h>
-#include <folly/String.h>
-#include <folly/Conv.h>
-#include <fcntl.h>
-#include <sys/time.h>
-#include <sys/socket.h>
-#include <system_error>
-#include <android/log.h>
-
-#if defined(WITH_FB_JSC_TUNING) && defined(__ANDROID__)
-#include <jsc_config_android.h>
-#endif
-
-#include "Instance.h"
-#include "Platform.h"
-#include "SystraceSection.h"
-#include "JSModulesUnbundle.h"
-#include "ModuleRegistry.h"
-#include "V8Executor.h"
-#include "V8NativeModules.h"
-#include "v8.h"
-#include "File.h"
-#include "libplatform/libplatform.h"
-
-using namespace rnv8;
-
-const char* MODULE_PROLOGUE = "(function(module, exports, require, __filename, __dirname){ ";
-const char* MODULE_EPILOGUE = "\n})";
-
-namespace v8 {
-
-#define THROW_RUNTIME_ERROR(INFO) do { \
-  LOGW("THROW_RUNTIME_ERROR: %s", INFO); \
-  std::throw_with_nested(std::runtime_error(INFO)); \
-} while(false)
-
-/*
- * This macro used for define scope for isolate which is created at the time initialization.
- */
-#define _ISOLATE_CONTEXT_ENTER Isolate *isolate = GetIsolate(); \
-  Isolate::Scope isolate_scope(isolate); \
-  HandleScope handle_scope(isolate); \
-  Local<Context> context = Local<Context>::New(isolate, m_context); \
-  Context::Scope context_scope(context); \
-
-static int s_NumberOfIsolates = 0;
-static bool s_PlatformInitialized = false;
-
-#if DEBUG
-static void nativeInjectHMRUpdate(const FunctionCallbackInfo<Value> &args) {
-  LOGV("V8Executor::nativeInjectHMRUpdate entry");
-  SystraceSection s("V8Executor.nativeInjectHMRUpdate");
-  if (args.Length() != 2) {
-    throw std::invalid_argument("Got wrong number of args");
-  }
-
-  Local<String> execJSString = Local<String>::Cast(args[0]);
-  Local<String> jsURL = Local<String>::Cast(args[1]);
-
-  //executeScript(args.GetIsolate()->GetCurrentContext(), execJSString);
-  LOGV("V8Executor::nativeInjectHMRUpdate exit");
-}
-#endif
-
-/*
- * This function used to get time taken by native module.
- */
-inline void nativePerformanceNow(const FunctionCallbackInfo<Value> &args) {
-  LOGV("V8Executor::nativePerformanceNow entry");
-  static const int64_t NANOSECONDS_IN_SECOND = 1000000000LL;
-  static const int64_t NANOSECONDS_IN_MILLISECOND = 1000000LL;
-
-  // This is equivalent to android.os.SystemClock.elapsedRealtime() in native
-  struct timespec now;
-  clock_gettime(CLOCK_MONOTONIC_RAW, &now);
-  int64_t nano = now.tv_sec * NANOSECONDS_IN_SECOND + now.tv_nsec;
-  args.GetReturnValue().Set((nano / (double) NANOSECONDS_IN_MILLISECOND));
-  LOGV("V8Executor::nativePerformanceNow exit");
-}
-
-// Native JS Function Hooks
-template<void (V8Executor::*method)(const FunctionCallbackInfo<Value> &args)>
-void V8Executor::installNativeFunctionHook(Local<ObjectTemplate> global, const char *name) {
-  LOGV("V8Executor::installNativeFunctionHook entry");
-  struct funcWrapper {
-    static void call(const v8::FunctionCallbackInfo<v8::Value> &args) {
-      Isolate *isolate = args.GetIsolate();
-      HandleScope handle_scope(isolate);
-      Local<Context> context = isolate->GetCurrentContext();
-      auto ptr = context->GetAlignedPointerFromEmbedderData(1);
-      V8Executor *executor = static_cast<V8Executor *>(ptr);
-      if (!executor) {
-        THROW_RUNTIME_ERROR("Get Empty Context in installNativeHook!");
-      }
-      (executor->*method)(std::move(args));
-    }
-  };
-  global->Set(toLocalString(GetIsolate(), name), FunctionTemplate::New(GetIsolate(), funcWrapper::call));
-  LOGV("V8Executor::installNativeFunctionHook exit");
-}
-
-// Native Static JS Function Hooks
-template<void(*method)(const v8::FunctionCallbackInfo<Value> &args)>
-void installGlobalFunction(Isolate *isolate, Local<ObjectTemplate> global, const char *name) {
-  LOGV("V8Executor::installGlobalFunction entry");
-  global->Set(toLocalString(isolate, name), FunctionTemplate::New(isolate, method));
-  LOGV("V8Executor::installGlobalFunction exit");
-}
-
-template<Global<Value>(V8Executor::*method)(Local<String> property, const PropertyCallbackInfo<Value> &callback)>
-void V8Executor::installNativePropertyHook(Local<ObjectTemplate> global, const char *name) {
-  LOGV("V8Executor::installNativePropertyHook entry");
-
-  struct funcWrapper {
-    static void call(Local<Name> localProperty, const PropertyCallbackInfo<Value> &info) {
-      printType(localProperty, "installNativePropertyHook.localProperty");
-      Local<Context> context = info.GetIsolate()->GetCurrentContext();
-      auto ptr = context->GetAlignedPointerFromEmbedderData(1);
-      V8Executor *executor = static_cast<V8Executor *>(ptr);
-      if (!executor) {
-        THROW_RUNTIME_ERROR("Get Empty Context in installNativePropertyHook!");
-      }
-
-      Global<Value> res = (executor->*method)(Local<String>::Cast(localProperty), std::move(info));
-      info.GetReturnValue().Set(res);
-    }
-  };
-  Isolate* isolate = GetIsolate();
-  Local<ObjectTemplate> nativeModuleProxyTemplate = ObjectTemplate::New(isolate);
-  nativeModuleProxyTemplate->SetHandler(NamedPropertyHandlerConfiguration(funcWrapper::call));
-  global->Set(toLocalString(isolate, name), nativeModuleProxyTemplate);
-  LOGV("V8Executor::installNativePropertyHook exit");
-}
-
-void V8Executor::ClearStartupData(StartupData* data) {
-  LOGV("V8Executor::ClearStartupData entry");
-  data->data = nullptr;
-  data->raw_size = 0;
-  LOGV("V8Executor::ClearStartupData exit");
-}
-
-StartupData* V8Executor::Load(const char* blob_file, void(*setter_fn)(v8::StartupData*)) {
-  LOGV("V8Executor::Load entry");
-  StartupData* startup_data = new StartupData;
-
-  long length = 0;
-
-  CHECK(blob_file);
-  auto data = File::ReadBinary(blob_file, length);
-  if (!data) {
-    LOGW("compiled_script->Run error: %s", blob_file);
-    return startup_data;
-  }
-  startup_data->raw_size = length;
-  startup_data->data = new char[startup_data->raw_size];
-  memcpy((void *) startup_data->data, (const void*) data, startup_data->raw_size);
-  if (startup_data->raw_size == length) {
-    (*setter_fn)(startup_data);
-  } else {
-    LOGW("Corrupted startup resource '%s'.\n", blob_file);
-  }
-  LOGV("V8Executor::Load exit");
-  return startup_data;
-}
-
-// PlatformInit function will be called once per process.
-// V8 platform is independent of V8 isolate/instance.
-void V8Executor::PlatformInit() {
-  if (!s_PlatformInitialized) {
-    Platform *platform = platform::CreateDefaultPlatform();
-    LOGV("V8Executor::PlatformInit CreateDefaultPlatform");
-
-    V8::InitializePlatform(platform);
-    LOGV("V8Executor::PlatformInit InitializePlatform");
-
-    V8::Initialize();
-    LOGV("V8Executor::PlatformInit Initialize");
-
-    s_PlatformInitialized = true;
-  }
-}
-
-Isolate *V8Executor::GetIsolate() {
-  LOGV("V8Executor::GetIsolate entry");
-
-  if (m_isolate) {
-    LOGV("V8Executor::GetIsolate not NULL");
-    return m_isolate;
-  }
-
-  PlatformInit();
-
-  Isolate::CreateParams create_params;
-  create_params.array_buffer_allocator = v8::ArrayBuffer::Allocator::NewDefaultAllocator();
-  // In-case external Snapshot file want to load like RN Js snapshot
-  //create_params.snapshot_blob = Load(fullPath.c_str(), V8::SetSnapshotDataBlob);
-
-  // Create a new Isolate and make it the current one.
-  Isolate *isolate = Isolate::New(create_params);
-  LOGV("V8Executor::GetIsolate Isolate::New");
-
-  m_isolate = isolate;
-  LOGV("V8Executor::GetIsolate exit");
-  s_NumberOfIsolates++;
-  return isolate;
-}
-
-/*
-* This below function used incase user set the enviorment variable
-*  to enable cache insted of enable from C++ reacthost instance.
-*/
-void V8Executor::TrySetJSEConfigFromEnv(){
-  const char* localPath = getenv("V8_JSCACHE_PATH");
-  if (localPath != NULL) {
-    if ( m_jseConfigParams == nullptr ){
-      LOGV("V8Executor.setCacheFromEnv V8_JSCACHE_PATH: %s", localPath);
-      m_jseConfigParams = std::make_unique<facebook::react::JSEConfigParams>();
-      m_jseConfigParams->cachePath = std::string(localPath);
-      m_jseConfigParams->cacheType = CachingType::FullCachingWithNoLazy;
-      m_jseConfigParams->loggingLevel = 50; // deafult logging 10 = Logging::LoggingLevel::ERROR
-    }
-  }
-}
-
-bool V8Executor::IsCacheEnabled() {
-  if (m_jseConfigParams == nullptr || (m_jseConfigParams->cacheType == CachingType::NoCaching) || (m_jseConfigParams->cachePath.empty())) {
-    return false;
-  }
-
-  if (!m_jseLocalPath.empty()) {
-    return true;
-  }
-
-  m_jseLocalPath = m_jseConfigParams->cachePath;
-  LOGV("V8Executor::IsCacheEnabled cachePath: %s", m_jseLocalPath.c_str());
-
-  return true;
-}
-
-bool V8Executor::ShouldSetNoLazyFlag() {
-  return (m_jseConfigParams != nullptr &&
-    (m_jseConfigParams->cacheType == CachingType::PartialCachingWithNoLazy || m_jseConfigParams->cacheType == CachingType::FullCachingWithNoLazy));
-}
-
-bool V8Executor::ShouldProduceFullCache() {
-  return (m_jseConfigParams != nullptr &&
-    (m_jseConfigParams->cacheType == CachingType::FullCaching || m_jseConfigParams->cacheType == CachingType::FullCachingWithNoLazy));
-}
-
-V8Executor::V8Executor(std::shared_ptr<ExecutorDelegate> delegate,
-                        std::shared_ptr<MessageQueueThread> messageQueueThread,
-                        const folly::dynamic& jscConfig,
-                        std::shared_ptr<JSEConfigParams> jseConfigParams) :
-  m_delegate(delegate),
-  m_messageQueueThread(messageQueueThread),
-  m_nativeModules(delegate ? delegate->getModuleRegistry() : nullptr),
-  m_jscConfig(jscConfig),
-  m_jseConfigParams(std::move(jseConfigParams)) {
-  LOGV("V8Executor::V8Executor entry");
-  if ( m_jseConfigParams == nullptr ){
-    TrySetJSEConfigFromEnv();
-  }
-  m_jseLocalPath = "";
-  if (m_jseConfigParams != nullptr) {
-    Logging::setLevel(Logging::forValue(m_jseConfigParams->loggingLevel));
-  }
-  initOnJSVMThread();
-  LOGV("V8Executor::V8Executor exit");
-}
-
-V8Executor::~V8Executor() {
-  LOGV("V8Executor::~V8Executor entry");
-  CHECK(*m_isDestroyed) << "V8Executor::destroy() must be called before its destructor!";
-  LOGV("V8Executor::~V8Executor exit");
-}
-
-void V8Executor::destroy() {
-  LOGV("V8Executor::destroy entry");
-  *m_isDestroyed = true;
-  if (m_messageQueueThread.get()) {
-    m_messageQueueThread->runOnQueueSync([this]() {
-      terminateOnJSVMThread();
-    });
-  } else {
-    terminateOnJSVMThread();
-  }
-  LOGV("V8Executor::destroy exit");
-}
-
-void V8Executor::setContextName(const std::string& name) {
-  LOGV("V8Executor::setContextName name: %s", name.c_str());
-}
-
-/*static bool canUseInspector(JSContextRef context) {
-#ifdef WITH_INSPECTOR
-  LOGV("V8Executor::canUseInspector true");
-  return true; // WITH_INSPECTOR && Android
-#else
-  LOGV("V8Executor::canUseInspector false");
-  return false; // !WITH_INSPECTOR
-#endif
-}
-*/
-void V8Executor::initOnJSVMThread() {
-  LOGV("V8Executor::initOnJSVMThread entry");
-  //SystraceSection s("V8Executor.initOnJSVMThread");
-  // TODO，not support Inspector now!
-  Isolate *isolate = GetIsolate();
-  Isolate::Scope isolate_scope(isolate);
-  HandleScope handle_scope(isolate);
-  Local<ObjectTemplate> global = ObjectTemplate::New(isolate);
-  // Bind the global 'print' function to the C++ Print callback.
-  installNativeFunctionHook<&V8Executor::nativeFlushQueueImmediate>(global, "nativeFlushQueueImmediate");
-  installNativeFunctionHook<&V8Executor::nativeCallSyncHook>(global, "nativeCallSyncHook");
-  installGlobalFunction<&nativeLog>(isolate, global, "nativeLoggingHook");
-  installGlobalFunction<&nativePerformanceNow>(isolate, global, "nativePerformanceNow");
-#if DEBUG
-  installGlobalFunction<&nativeInjectHMRUpdate>(isolate, global, "nativeInjectHMRUpdate");
-#endif
-  // TODO, trace and log
-  // native require
-  installNativeFunctionHook<&V8Executor::nativeRequire>(global, "nativeRequire");
-  {
-    SystraceSection s("nativeModuleProxy object");
-    installNativePropertyHook<&V8Executor::getNativeModule>(global, "nativeModuleProxy");
-  }
-  Local<Context> context = Context::New(isolate, NULL, global);
-  Context::Scope context_scope(context);
-  // Add a pointer to ourselves so we can retrieve it later in our hooks
-  context->SetAlignedPointerInEmbedderData(1, this);
-  m_context.Reset(isolate, context);
-
-  LOGV("V8Executor::initOnJSVMThread exit jsclocalPath = %s", m_jseLocalPath.c_str());
-}
-
-void V8Executor::terminateOnJSVMThread() {
-  LOGV("V8Executor::terminateOnJSVMThread entry");
-  SystraceSection s("V8Executor::terminateOnJSVMThread");
-  m_nativeModules.reset();
-  m_invokeCallbackAndReturnFlushedQueueJS.Reset();
-  m_callFunctionReturnFlushedQueueJS.Reset();
-  m_flushedQueueJS.Reset();
-  m_callFunctionReturnResultAndFlushedQueueJS.Reset();
-  m_context.Reset();
-  m_isolate->TerminateExecution();
-  m_isolate->Dispose();
-  m_isolate = NULL;
-  s_NumberOfIsolates--;
-  if (s_NumberOfIsolates == 0) {
-    V8::ShutdownPlatform();
-    s_PlatformInitialized = false;
-  }
-  LOGV("V8Executor::terminateOnJSVMThread exit");
-}
-
-// basename_r isn't in all android SDKs, so use this simple version instead.
-static std::string simpleBasename(const std::string &path) {
-  LOGV("V8Executor::simpleBasename entry");
-  size_t pos = path.rfind("/");
-  return (pos != std::string::npos) ? path.substr(pos) : path;
-  LOGV("V8Executor::simpleBasename exit");
-}
-
-void V8Executor::loadApplicationScript(std::unique_ptr<const JSBigString> script, std::string sourceURL) {
-
-  LOGV("V8Executor::loadApplicationScript entry sourceURL = %s", sourceURL.c_str());
-  SystraceSection s("V8Executor::loadApplicationScript", "sourceURL", sourceURL);
-  std::string scriptName = simpleBasename(sourceURL);
-  ReactMarker::logTaggedMarker(ReactMarker::RUN_JS_BUNDLE_START, scriptName.c_str());
-  _ISOLATE_CONTEXT_ENTER;
-  TryCatch try_catch(isolate);
-  Local<Script> compiled_script = LoadScript(std::move(toLocalString(isolate, std::move(script->c_str()))), scriptName, context);
-  // 	LOGV("V8Executor::loadApplicationScript after LoadScript;");
- // Run the script!
-  Local<Value> result;
-  if (!compiled_script->Run(context).ToLocal(&result)) {
-    // The TryCatch above is still in effect and will have caught the error.
-    String::Utf8Value error(isolate, try_catch.Exception());
-    LOGW("compiled_script->Run error: %s", *error);
-    THROW_RUNTIME_ERROR("Error ExecuteScript while running script!");
-  }
-
-  flush();
-  ReactMarker::logMarker(ReactMarker::CREATE_REACT_CONTEXT_STOP);
-  ReactMarker::logTaggedMarker(ReactMarker::RUN_JS_BUNDLE_STOP, scriptName.c_str());
-  LOGV("V8Executor::loadApplicationScript exit");
-}
-
-void V8Executor::registerBundle(uint32_t bundleId, const std::string& bundlePath) {
-  // NYI
-  std::terminate();
-}
-
-void V8Executor::SaveScriptCache(std::unique_ptr<ScriptCompiler::CachedData> cached_data, const std::string& path) {
-  LOGV("V8Executor::SaveScriptCache entry");
-  if (!cached_data) {
-    ReactMarker::logMarker(ReactMarker::BYTECODE_CREATION_FAILED);
-    LOGV("V8Executor::SaveScriptCache exit");
-    return;
-  }
-
-  int length = cached_data->length;
-  LOGV("V8Executor::SaveScriptCache entry %s ", path.c_str());
-
-  bool result = File::WriteBinary(path, cached_data->data, length);
-
-  if (!result) {
-    ReactMarker::logMarker(ReactMarker::BYTECODE_WRITE_FAILED);
-  }
-
-  LOGV("V8Executor::SaveScriptCache exit");
-}
-
-ScriptCompiler::CachedData* V8Executor::TryLoadScriptCache(const std::string& path) {
-  LOGV("V8Executor::TryLoadScriptCache entry");
-  long length = 0;
-  auto data = File::ReadBinary(path, length);
-  if (!data) {
-    return nullptr;
-  }
-
-  LOGV("V8Executor::TryLoadScriptCache exit");
-  return new ScriptCompiler::CachedData(reinterpret_cast<uint8_t*>(data), length, ScriptCompiler::CachedData::BufferOwned);
-
-}
-
-Local<String> V8Executor::ConvertToV8String(Isolate* isolate, const string& s) {
-  LOGV("V8Executor::ConvertToV8String entry");
-  Local<String> str = String::NewFromUtf8(isolate, s.c_str(), NewStringType::kNormal, s.length()).ToLocalChecked();
-  LOGV("V8Executor::ConvertToV8String exit");
-  return str;
-}
-
-Local<String> V8Executor::WrapModuleContent(const string& path) {
-  LOGV("V8Executor::WrapModuleContent entry");
-  string content = File::ReadText(path);
-  // TODO: Use statically allocated buffer for better performance
-  string result(MODULE_PROLOGUE);
-  result.reserve(content.length() + 1024);
-  result += content;
-  result += MODULE_EPILOGUE;
-  return ConvertToV8String(m_isolate, result);
-  LOGV("V8Executor::WrapModuleContent exit");
-}
-
-
-Local<Script> V8Executor::createAndGetScript(const Local<String> &scriptData, const string& path, Local<Context> context) {
-  string fullPath = m_jseLocalPath + string("/") + path + ".v8cache";
-  auto cacheData = TryLoadScriptCache(fullPath);
-
-  // No need to delete cacheData as ScriptCompiler::Source will take its ownership.
-  ScriptCompiler::Source source(scriptData, cacheData);
-  Local<Script> script;
-  Isolate *isolate = GetIsolate();
-  TryCatch tc(isolate);
-  ScriptCompiler::CompileOptions option = ScriptCompiler::kNoCompileOptions;
-
-  if (ShouldSetNoLazyFlag()) {
-    const char* lazy = "--nolazy";
-    V8::SetFlagsFromString(lazy, strlen(lazy));
-  }
-
-  if (cacheData != nullptr) {
-    //SystraceSection s("V8Executor::LoadScript Compile, cached");
-    LOGV("V8Executor::createAndGetScript cached path :%s", fullPath.c_str());
-
-    option = ScriptCompiler::kConsumeCodeCache;
-    auto maybeScript = ScriptCompiler::Compile(context, &source, option);
-
-    if (maybeScript.IsEmpty() || tc.HasCaught()) {
-      THROW_RUNTIME_ERROR("Error ExecuteScript while compile script!");
-    }
-
-    if (cacheData->rejected) {
-      int status = remove(fullPath.c_str());
-      LOGI("V8Executor::createAndGetScript cache was rejected. Cache delete status: %d ", status);
-    }
-
-    script = maybeScript.ToLocalChecked();
-  } else {
-    //SystraceSection s("V8Executor::LoadScript Compile, no cached");
-    LOGV("V8Executor::createAndGetScript no cached");
-
-    if (ShouldProduceFullCache()) {
-      option = ScriptCompiler::kProduceFullCodeCache;
-    } else {
-      option = ScriptCompiler::kProduceCodeCache;
-    }
-
-    auto maybeScript = ScriptCompiler::Compile(context, &source, option);
-    LOGV("V8Executor::createAndGetScript, after compile");
-
-    if (maybeScript.IsEmpty() || tc.HasCaught()) {
-      THROW_RUNTIME_ERROR("Error ExecuteScript while compile script!");
-    }
-
-    script = maybeScript.ToLocalChecked();
-
-    Local<UnboundScript> uScript = script->GetUnboundScript();
-
-    // CreateCodeCache always create buffer with BufferPolicy::BufferOwned,
-    // We need to just free CachedData and it will take care of deleting underlying buffer.
-    std::unique_ptr<ScriptCompiler::CachedData> cacheData{ ScriptCompiler::CreateCodeCache(uScript) };
-
-    LOGV("V8Executor::createAndGetScript, after ToLocalChecked");
-    SaveScriptCache(std::move(cacheData), fullPath);
-    LOGV("V8Executor::createAndGetScript, after save");
-  }
-
-  LOGV("V8Executor::createAndGetScript exit");
-  return script;
-}
-
-Local<Script> V8Executor::LoadScript(const Local<String> &scriptData, const string& path, Local<Context> context) {
-  LOGV("V8Executor::LoadScript entry %s", path.c_str());
-  string frameName("LoadScript " + path);
-  Isolate *isolate = GetIsolate();
-  TryCatch tc(isolate);
-
-  if (!IsCacheEnabled()) {
-    ScriptCompiler::Source nonCachedSource(scriptData);
-
-    auto maybeScript = ScriptCompiler::Compile(context, &nonCachedSource);
-    LOGV("V8Executor::LoadScript, after compile");
-
-    if (maybeScript.IsEmpty() || tc.HasCaught()) {
-      THROW_RUNTIME_ERROR("Error ExecuteScript while compile script!");
-    }
-
-    return maybeScript.ToLocalChecked();
-  }
-
-  return createAndGetScript(scriptData, path, context);
-}
-
-void V8Executor::setBundleRegistry(std::unique_ptr<RAMBundleRegistry> bundleRegistry) {
-  LOGV("V8Executor::setBundleRegistry entry");
-  m_bundleRegistry = std::move(bundleRegistry);
-  LOGV("V8Executor::setBundleRegistry exit");
-}
-
-void V8Executor::bindBridge() {
-  LOGV("V8Executor::bindBridge entry");
-  SystraceSection s("V8Executor::bindBridge");
-  std::call_once(m_bindFlag, [this] {
-    _ISOLATE_CONTEXT_ENTER;
-    Local<Object> globalObj = context->Global();
-    Local<Value> batchedBridgeValue; // batchedBridgeValue;
-    if (!globalObj->Get(context, toLocalString(isolate, "__fbBatchedBridge")).ToLocal(&batchedBridgeValue)) {
-      Local<Value> requireBatchedBridge; // batchedBridgeValue;
-      if (globalObj->Get(context, toLocalString(isolate, "__fbRequireBatchedBridge")).ToLocal(&requireBatchedBridge)) {
-        Local<Function> requireBatchedBridgeFunc = Local<Function>::Cast(requireBatchedBridge);
-        if (!requireBatchedBridgeFunc->Call(context, context->Global(), 0, {}).ToLocal(&batchedBridgeValue)) {
-          THROW_RUNTIME_ERROR("Could not get BatchedBridge, make sure your bundle is packaged correctly");
-        }
-      }
-    }
-    if (batchedBridgeValue.IsEmpty()) {
-      THROW_RUNTIME_ERROR("Could not get BatchedBridge, make sure your bundle is packaged correctly");
-    }
-    Local<Object> batchedBridge = Local<Object>::Cast(batchedBridgeValue);
-    auto funcSet = [&](const char *name, Global<Function> &globalFunc) mutable {
-      Local<Function> localFunc = Local<Function>::Cast(batchedBridge->Get(toLocalString(isolate, name)));
-      globalFunc.Reset(isolate, localFunc);
-    };
-    funcSet("callFunctionReturnFlushedQueue", m_callFunctionReturnFlushedQueueJS);
-    funcSet("invokeCallbackAndReturnFlushedQueue", m_invokeCallbackAndReturnFlushedQueueJS);
-    funcSet("flushedQueue", m_flushedQueueJS);
-    funcSet("callFunctionReturnResultAndFlushedQueue", m_callFunctionReturnResultAndFlushedQueueJS);
-  });
-  LOGV("V8Executor::bindBridge exit");
-}
-
-void V8Executor::callNativeModules(Local<Context> context, Local<Value> value) {
-  LOGV("V8Executor::callNativeModules entry");
-  SystraceSection s("V8Executor::callNativeModules");
-  CHECK(m_delegate) << "Attempting to use native modules without a delegate";
-  try {
-    if (!value.IsEmpty() && value->IsObject()) {
-      Local<Object> obj = Local<Object>::Cast(value);
-      const std::string &arg = toJsonStdString(context, std::move(obj));
-      LOGV("callNativeModules arg: %s", arg.c_str());
-      m_delegate->callNativeModules(*this, folly::parseJson(std::move(arg)), true);
-    } else {
-      m_delegate->callNativeModules(*this, folly::parseJson("null"), true);
-    }
-  } catch (...) {
-    std::string message = "Error in callNativeModules()";
-    std::throw_with_nested(std::runtime_error(message));
-  }
-  LOGV("V8Executor::callNativeModules exit");
-}
-
-void V8Executor::flush() {
-  LOGV("V8Executor::flush entry");
-  SystraceSection s("V8Executor::flush");
-  if (!m_flushedQueueJS.IsEmpty()) {
-    _ISOLATE_CONTEXT_ENTER;
-    Local<Function> flushedQueueJS = Local<Function>::New(isolate, m_flushedQueueJS);
-    callNativeModules(context, safeToLocal(flushedQueueJS->Call(context, context->Global(), 0, {})));
-    return;
-  }
-
-  // When a native module is called from JS, BatchedBridge.enqueueNativeCall()
-  // is invoked.  For that to work, require('BatchedBridge') has to be called,
-  // and when that happens, __fbBatchedBridge is set as a side effect.
-  _ISOLATE_CONTEXT_ENTER;
-  Local<Object> globalObj = context->Global();
-  Local<Value> batchedBridgeValue; // batchedBridgeValue;
-  if (globalObj->Get(context, toLocalString(isolate, "__fbBatchedBridge")).ToLocal(&batchedBridgeValue)) {
-    LOGV("V8Executor::flush obj __fbBatchedBridge is not empty");
-    bindBridge();
-    Local<Function> flushedQueueJS = Local<Function>::New(isolate, m_flushedQueueJS);
-    callNativeModules(context, safeToLocal(flushedQueueJS->Call(context, context->Global(), 0, {})));
-  } else if (m_delegate) {
-    // If we have a delegate, we need to call it; we pass a null list to
-    // callNativeModules, since we know there are no native calls, without
-    // calling into JS again.  If no calls were made and there's no delegate,
-    // nothing happens, which is correct.
-    callNativeModules(context, Local<Value>());
-  }
-  LOGV("V8Executor::flush exit");
-}
-
-void V8Executor::callFunction(const std::string &moduleId, const std::string &methodId, const folly::dynamic &arguments) {
-  SystraceSection s("V8Executor::callFunction");
-  LOGV("V8Executor::callFunction entry moduleId: %s, methodId:%s", moduleId.c_str(), methodId.c_str());
-  // TODO, lock context
-  if (m_callFunctionReturnResultAndFlushedQueueJS.IsEmpty()) {
-    bindBridge();
-  }
-  _ISOLATE_CONTEXT_ENTER;
-  Local<Function> localFunc = Local<Function>::New(isolate, m_callFunctionReturnFlushedQueueJS);
-  Local<String> localModuleId = toLocalString(isolate, moduleId);
-  Local<String> localMethodId = toLocalString(isolate, methodId);
-  const std::string &json = folly::toJson(arguments);
-  Local<String> json_str = toLocalString(isolate, std::move(json));
-  Local<Value> localArguments = safeToLocal(JSON::Parse(context, json_str));
-  Local<Value> argv[3] = { localModuleId, localMethodId, localArguments };
-  Local<Value> result = safeToLocal(localFunc->Call(context, context->Global(), 3, argv)); // TODO, catch exception
-  callNativeModules(context, result);
-  LOGV("V8Executor::callFunction exit");
-}
-
-void V8Executor::invokeCallback(const double callbackId, const folly::dynamic &arguments) {
-  SystraceSection s("V8Executor::invokeCallback");
-  // TODO, lock context
-  if (m_invokeCallbackAndReturnFlushedQueueJS.IsEmpty()) {
-    bindBridge();
-  }
-  _ISOLATE_CONTEXT_ENTER;
-  Local<Function> invokeFunc = Local<Function>::New(isolate, m_invokeCallbackAndReturnFlushedQueueJS);
-  Local<Number> localCallbackId = Number::New(isolate, callbackId);
-  Local<Value> localArguments = fromDynamic(isolate, context, arguments);
-  Local<Value> argv[2] = { localCallbackId, localArguments };
-  Local<Value> result = safeToLocal(invokeFunc->Call(context, context->Global(), 2, argv));
-  callNativeModules(context, result);
-}
-
-void V8Executor::setGlobalVariable(std::string propName, std::unique_ptr<const JSBigString> jsonValue) {
-  try {
-    SystraceSection s("V8Executor.setGlobalVariable", "propName", propName);
-    _ISOLATE_CONTEXT_ENTER;
-    Local<String> propNameString = toLocalString(isolate, propName);
-    Local<Value> attribute = fromJsonString(isolate, context, jsonValue->c_str(), jsonValue->size());
-    context->Global()->Set(propNameString, attribute);
-  } catch (...) {
-    std::throw_with_nested(std::runtime_error("Error setting global variable: " + propName));
-  }
-}
-
-std::string V8Executor::getDescription() {
-  return "v8";
-}
-
-void *V8Executor::getJavaScriptContext() {
-  return this;
-}
-
-#ifdef WITH_JSC_MEMORY_PRESSURE
-void V8Executor::handleMemoryPressure(int pressureLevel) {
-  __android_log_print("V8Executor", "handle memory pressure");
-  Isolate *isolate = GetIsolate();
-  if (isolate) {
-    isolate->MemoryPressureNotification(pressureLevel);
-  }
-}
-#endif 
-
-void V8Executor::loadModule(uint32_t bundleId, uint32_t moduleId) {
-  if (!m_bundleRegistry) {
-    return;
-  }
-  _ISOLATE_CONTEXT_ENTER;
-  auto module = m_bundleRegistry->getModule(bundleId, moduleId);
-  auto source = toLocalString(isolate, module.code);
-  std::string path = module.name;
-  // TODO
-  //_ISOLATE_CONTEXT_ENTER;
-  //executeScript(context, std::move(toLocalString(isolate, std::move(script->c_str()))));
-  TryCatch try_catch(isolate);
-  LOGV("V8Executor::loadModule before LoadScript");
-  Local<Script> compiled_script = LoadScript(source, path, context);
-  // Run the script!
-  Local<Value> result;
-  if (!compiled_script->Run(context).ToLocal(&result)) {
-    // The TryCatch above is still in effect and will have caught the error.
-    String::Utf8Value error(isolate, try_catch.Exception());
-    LOGW("compiled_script->Run error: %s", *error);
-    THROW_RUNTIME_ERROR("Error ExecuteScript while running script!");
-  }
-  //executeScript(context, source);
-}
-
-Global<Value> V8Executor::getNativeModule(Local<String> property, const PropertyCallbackInfo<Value> &info) {
-  SystraceSection s("V8Executor.getNativeModule");
-  _ISOLATE_CONTEXT_ENTER;
-  const std::string prop = toStdString(property);
-  LOGV("V8Executor::getNativeModule property length %d", prop.length());
-  LOGV("V8Executor::getNativeModule property %s", prop.c_str());
-  if ("name" == prop) {
-    return Global<Value>(isolate, toLocalString(isolate, "NativeModules"));
-  }
-  return m_nativeModules.getModule(isolate, context, std::move(prop));
-}
-
-void V8Executor::nativeRequire(const v8::FunctionCallbackInfo<v8::Value> &args) {
-  SystraceSection s("V8Executor.nativeRequire");
-  if (args.Length() != 2) {
-    throw std::invalid_argument("Got wrong number of args");
-  }
-  Local<Uint32> bundleId;
-  Local<Uint32> moduleId;
-  std::tie(bundleId, moduleId) = parseNativeRequireParameters(args);
-  LOGV("V8Executor::nativeRequire bundleId %d, moduleId %d", bundleId->Value(), moduleId->Value());
-
-  ReactMarker::logMarker(ReactMarker::NATIVE_REQUIRE_START);
-  loadModule(bundleId->Value(), moduleId->Value());
-  ReactMarker::logMarker(ReactMarker::NATIVE_REQUIRE_STOP);
-}
-
-
-void V8Executor::nativeFlushQueueImmediate(const v8::FunctionCallbackInfo<v8::Value> &args) {
-  LOGV("V8Executor::nativeFlushQueueImmediate entry");
-
-  SystraceSection s("V8Executor.nativeFlushQueueImmediate");
-  if (args.Length() != 1) {
-    throw std::invalid_argument("Got wrong number of args");
-  }
-  _ISOLATE_CONTEXT_ENTER;
-
-
-  auto queueStr = toJsonStdString(context, Local<Object>::Cast(args[0]));
-  LOGV("V8Executor::nativeFlushQueueImmediate %s", queueStr.c_str());
-  m_delegate->callNativeModules(*this, folly::parseJson(queueStr), false);
-}
-
-void V8Executor::nativeCallSyncHook(const v8::FunctionCallbackInfo<v8::Value> &args) {
-  SystraceSection s("V8Executor.nativeCallSyncHook");
-  if (args.Length() != 3) {
-    throw std::invalid_argument("Got wrong number of args");
-  }
-
-  Isolate* isolate = args.GetIsolate();
-  Local<Context> context = Local<Context>::New(isolate, m_context);
-  unsigned int moduleId = (unsigned int) Number::Cast(*(args[0]))->Value();
-  unsigned int methodId = (unsigned int) Number::Cast(*(args[1]))->Value();
-  LOGV("V8Executor::nativeCallSyncHook moduleId %d, methodId %d", moduleId, methodId);
-  const std::string &argsJson = toJsonStdString(context, Local<Object>::Cast(args[2]));
-  folly::dynamic dynamicArgs = folly::parseJson(std::move(argsJson));
-  if (!dynamicArgs.isArray()) {
-    throw std::invalid_argument(
-      folly::to<std::string>("method parameters should be array, but are ", dynamicArgs.typeName()));
-  }
-
-  MethodCallResult result = m_delegate->callSerializableNativeHook(*this, moduleId, methodId, std::move(dynamicArgs));
-  if (!result.hasValue()) {
-    return;
-  }
-
-  args.GetReturnValue().Set(fromDynamic(isolate, context, std::move(result.value())));
-}
-
-std::unique_ptr<JSExecutor> V8ExecutorFactory::createJSExecutor(std::shared_ptr<ExecutorDelegate> delegate,
-  std::shared_ptr<MessageQueueThread> jsQueue) {
-  return folly::make_unique<v8::V8Executor>(delegate, jsQueue, std::move(m_jscConfig), nullptr);
-}
-
-std::unique_ptr<JSExecutor> V8ExecutorFactory::createJSExecutor(std::shared_ptr<ExecutorDelegate> delegate,
-  std::shared_ptr<MessageQueueThread> jsQueue, std::shared_ptr<JSEConfigParams> jseConfigParams) {
-  return folly::make_unique<v8::V8Executor>(delegate, jsQueue, std::move(m_jscConfig), std::move(jseConfigParams));
-}
-}
diff --git a/ReactCommon/cxxreact/V8Executor.h b/ReactCommon/cxxreact/V8Executor.h
deleted file mode 100644
index 5b445fdefd6b..000000000000
--- a/ReactCommon/cxxreact/V8Executor.h
+++ /dev/null
@@ -1,163 +0,0 @@
-#ifndef V8_V8EXECUTOR_H
-#define V8_V8EXECUTOR_H
-
-#pragma once
-
-#include <cxxreact/JSExecutor.h>
-#include <cxxreact/V8NativeModules.h>
-#include <cxxreact/RAMBundleRegistry.h>
-#include <folly/Optional.h>
-#include <folly/json.h>
-#include "MessageQueueThread.h"
-#include <privatedata/PrivateDataBase.h>
-#include <string>
-#include "v8.h"
-#include <v8helpers/V8Utils.h>
-
-#ifndef RN_EXPORT
-#define RN_EXPORT __attribute__((visibility("default")))
-#endif
-
-
-namespace v8 {
-
-class RN_EXPORT V8ExecutorFactory : public JSExecutorFactory {
-public:
-  V8ExecutorFactory(const folly::dynamic& jscConfig) :
-    m_jscConfig(jscConfig) {}
-
-  std::unique_ptr<JSExecutor> createJSExecutor(
-    std::shared_ptr<ExecutorDelegate> delegate,
-    std::shared_ptr<MessageQueueThread> jsQueue) override;
-
-  std::unique_ptr<JSExecutor> createJSExecutor(
-    std::shared_ptr<ExecutorDelegate> delegate,
-    std::shared_ptr<MessageQueueThread> jsQueue,
-    std::shared_ptr<JSEConfigParams> jseConfigParams) override;
-
-private:
-  std::string m_cacheDir;
-  folly::dynamic m_jscConfig;
-};
-
-class RN_EXPORT V8Executor : public JSExecutor, public PrivateDataBase {
-public:
-  /**
-   * Must be invoked from thread this Executor will run on.
-   */
-  explicit V8Executor(std::shared_ptr<ExecutorDelegate> delegate,
-                       std::shared_ptr<MessageQueueThread> messageQueueThread,
-                       const folly::dynamic& jscConfig,
-                       std::shared_ptr<JSEConfigParams> jseConfigParams);
-
-  virtual ~V8Executor() override;
-
-  virtual void loadApplicationScript(
-    std::unique_ptr<const JSBigString> script,
-    std::string sourceURL) override;
-    
-  virtual void registerBundle(uint32_t bundleId, const std::string& bundlePath) override;
-
-  virtual void setBundleRegistry(std::unique_ptr<RAMBundleRegistry> bundleRegistry) override;
-
-  virtual void callFunction(
-    const std::string& moduleId,
-    const std::string& methodId,
-    const folly::dynamic& arguments) override;
-
-  virtual void invokeCallback(
-      const double callbackId,
-      const folly::dynamic& arguments) override;
-
-/*  template <typename T>
-  Value callFunctionSync(const std::string& module, const std::string& method, T&& args) {
-          return callFunctionSyncWithValue(
-            module, method, ValueEncoder<typename std::decay<T>::type>::toValue(
-              m_context, std::forward<T>(args)));
-  }*/
-
-  virtual void setGlobalVariable(
-    std::string propName,
-    std::unique_ptr<const JSBigString> jsonValue) override;
-
-  virtual std::string getDescription() override;
-
-  virtual void* getJavaScriptContext() override;
-
-#ifdef WITH_JSC_MEMORY_PRESSURE
-   virtual void handleMemoryPressure(int pressureLevel) override;
-#endif
-
-  virtual void destroy() override;
-
-  void setContextName(const std::string& name);
-
-  /**
-   * global data, one Isolage running on one thread
-   */
-  void PlatformInit();
-  Isolate *GetIsolate();
-  void ClearStartupData(StartupData* data);
-  StartupData* Load(const char* blob_file, void (*setter_fn)(v8::StartupData*) );
-
-private:
-  Global<Context> m_context;
-  std::shared_ptr<ExecutorDelegate> m_delegate;
-  std::shared_ptr<bool> m_isDestroyed = std::shared_ptr<bool>(new bool(false));
-  std::shared_ptr<MessageQueueThread> m_messageQueueThread;
-  std::unique_ptr<RAMBundleRegistry> m_bundleRegistry;
-  V8NativeModules m_nativeModules;
-  folly::dynamic m_jscConfig;
-  std::once_flag m_bindFlag;
-
-  Global<Function> m_invokeCallbackAndReturnFlushedQueueJS;
-  Global<Function> m_callFunctionReturnFlushedQueueJS;
-  Global<Function> m_flushedQueueJS;
-  Global<Function> m_callFunctionReturnResultAndFlushedQueueJS;
-
-  
-  void initOnJSVMThread();
-  bool isNetworkInspected(const std::string &owner, const std::string &app, const std::string &device);
-  // This method is experimental, and may be modified or removed.
-  // Value callFunctionSyncWithValue(const std::string& module, const std::string& method, Value value);
-  void terminateOnJSVMThread();
-  void bindBridge();
-  void callNativeModules(Local<Context> context, Local<Value> value);
-  void flush() override;
-  void flushQueueImmediate(Value&&);
-  void loadModule(uint32_t bundleId, uint32_t moduleId);
-
-  bool IsCacheEnabled();
-  bool ShouldSetNoLazyFlag();
-  bool ShouldProduceFullCache();
-
-  // Added to Save Cache
-  void SaveScriptCache(std::unique_ptr<ScriptCompiler::CachedData> cached_data, const std::string& path);
-  Local<String> ConvertToV8String(Isolate* isolate, const string& s);
-  Local<String> WrapModuleContent(const string& path);
-  Local<Script> LoadScript(const Local<String> &scriptData, const string& path, Local<Context> context);
-  Local<Script> createAndGetScript(const Local<String> &scriptData, const string& path, Local<Context> context);
-  void executeScript(Local<Context> context, const Local<String> &script);
-  ScriptCompiler::CachedData* TryLoadScriptCache(const std::string& path);
-  Global<Value> getNativeModule(Local<String> property, const PropertyCallbackInfo<Value> &info);
-
-  String adoptString(std::unique_ptr<const JSBigString>);
-
-  template<void (V8Executor::*method)(const v8::FunctionCallbackInfo<v8::Value> &args)>
-  void installNativeFunctionHook(Local<ObjectTemplate> global, const char *name);
-  template<Global<Value> (V8Executor::*method)(Local<String> property, const PropertyCallbackInfo<Value> &info)>
-  void installNativePropertyHook(Local<ObjectTemplate> global, const char *name);
-
-  void nativeRequire(const FunctionCallbackInfo<Value> &args);
-  void nativeFlushQueueImmediate(const FunctionCallbackInfo<Value> &args);
-  void nativeCallSyncHook(const FunctionCallbackInfo<Value> &args);
-
-  void TrySetJSEConfigFromEnv();
-
-  Isolate *m_isolate = nullptr; // shared on global
-  std::string m_jseLocalPath;
-  std::shared_ptr<JSEConfigParams> m_jseConfigParams;
-
-};
-}
-#endif //V8_DEMO_V8EXECUTOR_H
diff --git a/ReactCommon/cxxreact/V8NativeModules.cpp b/ReactCommon/cxxreact/V8NativeModules.cpp
deleted file mode 100644
index 5b21ca87616f..000000000000
--- a/ReactCommon/cxxreact/V8NativeModules.cpp
+++ /dev/null
@@ -1,82 +0,0 @@
-
-#include <string>
-#include "v8.h"
-#include <v8helpers/V8Utils.h>
-#include "V8NativeModules.h"
-#include <folly/json.h>
-#include <folly/Exception.h>
-#include <folly/Memory.h>
-#include <folly/String.h>
-#include <folly/Conv.h>
-
-using namespace facebook::react;
-using namespace std;
-
-namespace v8 {
-
-auto newFromChar = [](Isolate *isolate, const char *body) {
-    return String::NewFromUtf8(isolate, body);
-};
-
-V8NativeModules::V8NativeModules(std::shared_ptr<ModuleRegistry> moduleRegistry) :
-        m_moduleRegistry(std::move(moduleRegistry)) { }
-
-Global<Value> V8NativeModules::getModule(Isolate *isolate, Local<Context> context, const std::string &moduleName) {
-  //LOGD("V8NativeModules::getModule moduleName %s", moduleName.c_str());
-  if (!m_moduleRegistry) {
-      return Global<Value>();
-  }
-  auto it = m_objects.find(moduleName);
-  if (it != m_objects.end()) {
-    return Global<Value>(isolate, it->second);
-  }
-  Local<Value> module = createModule(isolate, context, moduleName);
-  if (module.IsEmpty()) {
-    return Global<Value>();
-  }
-  Global<Value> globalValue;
-  globalValue.Reset(isolate, module);
-  auto result = m_objects.emplace(std::move(moduleName), std::move(globalValue)).first;
-  return Global<Value>(isolate, result->second);
-}
-
-Local<Value> V8NativeModules::createModule(Isolate *isolate, Local<Context> context, const std::string &name) {
-  if (m_genNativeModuleJS.IsEmpty()) {
-    Local<Object> globalObj = context->Global();
-    Local<Value> fbGenNativeModuleValue;
-    //LOGD("V8NativeModules::createModule m_genNativeModuleJS");
-    if(globalObj->Get(context, String::NewFromUtf8(isolate, "__fbGenNativeModule")).ToLocal(&fbGenNativeModuleValue)){
-      //LOGD("V8NativeModules::createModule m_genNativeModuleJS1111");
-      Local<Function> fbGenNativeModuleFunc = Local<Function>::Cast(fbGenNativeModuleValue);
-      m_genNativeModuleJS.Reset(isolate, fbGenNativeModuleFunc);
-    }
-  }
-  auto result = m_moduleRegistry->getConfig(name);
-
-  if (!result.hasValue()) {
-    //LOGD("V8NativeModules::createModule moduleName %s return NULL", name.c_str());
-    return Local<Value>();
-  }
-
-  Local<Function> genNativeModuleJS = Local<Function>::New(isolate, m_genNativeModuleJS);
-  Local<Integer> moduleId = Integer::NewFromUnsigned(isolate, result->index);
-  Local<String> config = toLocalString(isolate, std::move(folly::toJson(result->config)));
-  Local<Value> configArguments = JSON::Parse(context, config).ToLocalChecked();
-  Local<Value> argv[2] = {configArguments, moduleId};
-  Local<Value> res ;
-  if(genNativeModuleJS->Call(context, context->Global(), 2, argv).ToLocal(&res)) {
-    Local<Object> obj = Local<Object>::Cast(res);
-    Local<Value> finalResult = obj->Get(context, newFromChar(isolate, "module")).ToLocalChecked();
-    return finalResult;
-  } else {
-    CHECK(!res.IsEmpty()) << "Module returned from genNativeModule is null";
-    return Local<Value>();
-  }
-}
-
-void V8NativeModules::reset() {
-  m_genNativeModuleJS.Reset();
-  m_objects.clear();
-}
-
-}
diff --git a/ReactCommon/cxxreact/V8NativeModules.h b/ReactCommon/cxxreact/V8NativeModules.h
deleted file mode 100644
index cd978e07897d..000000000000
--- a/ReactCommon/cxxreact/V8NativeModules.h
+++ /dev/null
@@ -1,34 +0,0 @@
-#ifndef V8_DEMO_V8NATIVEMODULES_H
-#define V8_DEMO_V8NATIVEMODULES_H
-
-#pragma once
-
-#include <memory>
-#include <string>
-
-#include <cxxreact/ModuleRegistry.h>
-#include <folly/Optional.h>
-#include "v8.h"
-
-using namespace facebook::react;
-using namespace std;
-
-namespace v8 {
-
-class V8NativeModules {
-
-public:
-  explicit V8NativeModules(std::shared_ptr<ModuleRegistry> moduleRegistry);
-  Global<Value> getModule(Isolate *isolate, Local<Context> context, const std::string &moduleName);
-  void reset();
-
-private:
-  Global<Function> m_genNativeModuleJS;
-  std::shared_ptr<ModuleRegistry> m_moduleRegistry;
-  std::unordered_map<std::string, Global<Value>> m_objects;
-
-  Local<Value> createModule(Isolate *isolate, Local<Context> context, const std::string &name) ;
-};
-}
-
-#endif //V8_DEMO_V8NATIVEMODULES_H
diff --git a/ReactCommon/jsi/Android.mk b/ReactCommon/jsi/Android.mk
index 58f016b5f143..cb293890d260 100644
--- a/ReactCommon/jsi/Android.mk
+++ b/ReactCommon/jsi/Android.mk
@@ -20,28 +20,22 @@ include $(BUILD_STATIC_LIBRARY)
 
 include $(CLEAR_VARS)
 
-LOCAL_V8_FILES := \
+LOCAL_SRC_FILES := \
     FileUtils.cpp \
     V8Runtime_shared.cpp \
     V8Runtime_basic.cpp \
     V8Runtime_droid.cpp \
     V8Platform.cpp \
 
-LOCAL_JSC_FILES := \
-   JSCRuntime.cpp \
-
-ifeq ($(JS_ENGINE), V8)
-  LOCAL_MODULE := v8runtime
-  LOCAL_SRC_FILES := $(LOCAL_V8_FILES)
-  LOCAL_SHARED_LIBRARIES := libfolly_json glog libv8 libv8platform libv8base
-else ifeq ($(JS_ENGINE), JSC)
-  LOCAL_MODULE := jscruntime
-  LOCAL_SRC_FILES := $(LOCAL_JSC_FILES)
-  LOCAL_SHARED_LIBRARIES += libfolly_json glog libjsc
-endif
+LOCAL_MODULE := v8runtime
+LOCAL_SHARED_LIBRARIES := libfolly_json glog libv8 libv8platform libv8base
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/..
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
 
 LOCAL_CFLAGS := -fexceptions -frtti -O3
 include $(BUILD_STATIC_LIBRARY)
+
+$(call import-module,v8base)
+$(call import-module,v8)
+$(call import-module,v8platform)
diff --git a/ReactCommon/privatedata/Android.mk b/ReactCommon/privatedata/Android.mk
deleted file mode 100644
index a6f30b08ed73..000000000000
--- a/ReactCommon/privatedata/Android.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := privatedata
-
-LOCAL_SRC_FILES := \
-  PrivateDataBase.cpp \
-
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/..
-LOCAL_EXPORT_C_INCLUDES := $(LOCAL_C_INCLUDES)
-
-LOCAL_CFLAGS := \
-  -DLOG_TAG=\"ReactNative\"
-
-LOCAL_CXXFLAGS += -fexceptions -frtti
-
-include $(BUILD_SHARED_LIBRARY)
diff --git a/ReactCommon/privatedata/PrivateDataBase.cpp b/ReactCommon/privatedata/PrivateDataBase.cpp
deleted file mode 100644
index dd76506594c4..000000000000
--- a/ReactCommon/privatedata/PrivateDataBase.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright (c) 2004-present, Facebook, Inc.
-
-// This source code is licensed under the MIT license found in the
-// LICENSE file in the root directory of this source tree.
-
-#include "PrivateDataBase.h"
-
-namespace facebook {
-namespace react {
-
-PrivateDataBase::~PrivateDataBase() {}
-
-} }
diff --git a/ReactCommon/privatedata/PrivateDataBase.h b/ReactCommon/privatedata/PrivateDataBase.h
deleted file mode 100644
index 90eaacd1f25a..000000000000
--- a/ReactCommon/privatedata/PrivateDataBase.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright (c) 2004-present, Facebook, Inc.
-
-// This source code is licensed under the MIT license found in the
-// LICENSE file in the root directory of this source tree.
-
-#pragma once
-
-#include <cassert>
-#include <cstdlib>
-#include <type_traits>
-
-#ifndef RN_EXPORT
-#define RN_EXPORT __attribute__((visibility("default")))
-#endif
-
-namespace facebook {
-namespace react {
-
-// Base class for private data used to implement hybrid JS-native objects. A common root class,
-// rtti and dynamic_cast allow us to do some runtime type checking that makes it possible
-// for multiple hybrid object implementations to co-exist.
-class RN_EXPORT PrivateDataBase {
- public:
-  virtual ~PrivateDataBase();
-
-  // Casts given void* to PrivateDataBase and performs dynamic_cast to desired type. Returns null on
-  // failure.
-  template <typename T>
-  static typename std::enable_if<std::is_base_of<PrivateDataBase, T>::value, T>::type* tryCast(void* ptr) {
-#ifdef _MSC_VER
-    #pragma warning(suppress: 4541)
-    return dynamic_cast<T*>(reinterpret_cast<PrivateDataBase*>(ptr));
-#else
-    return dynamic_cast<T*>(reinterpret_cast<PrivateDataBase*>(ptr));
-#endif
-  }
-
-  // Like tryCast, but aborts on failure.
-  template <typename T>
-  static typename std::enable_if<std::is_base_of<PrivateDataBase, T>::value, T>::type* cast(void* ptr) {
-    auto result = tryCast<T>(ptr);
-    if (!result) {
-      assert(false && "could not cast to desired type");
-      abort();
-    }
-    return result;
-  }
-};
-
-} }
diff --git a/ReactCommon/v8helpers/Android.mk b/ReactCommon/v8helpers/Android.mk
deleted file mode 100644
index 97e75af0cbe2..000000000000
--- a/ReactCommon/v8helpers/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := v8helpers
-
-LOCAL_SRC_FILES := \
-  V8Utils.cpp \
- 
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/..
-LOCAL_EXPORT_C_INCLUDES := $(LOCAL_C_INCLUDES)
-
-LOCAL_CFLAGS := \
-  -DLOG_TAG=\"ReactNative\"
-
-LOCAL_CXXFLAGS += -frtti -fexceptions 
-LOCAL_CFLAGS += -Wall -Werror 
-CXX14_FLAGS := -std=c++14
-LOCAL_CFLAGS += $(CXX14_FLAGS)
-LOCAL_EXPORT_CPPFLAGS := $(CXX14_FLAGS)
-
-LOCAL_SHARED_LIBRARIES := libfolly_json libv8
-
-include $(BUILD_STATIC_LIBRARY)
-
-$(call import-module,folly)
-$(call import-module,v8)
diff --git a/ReactCommon/v8helpers/V8Utils.cpp b/ReactCommon/v8helpers/V8Utils.cpp
deleted file mode 100644
index fae3b2bfe02e..000000000000
--- a/ReactCommon/v8helpers/V8Utils.cpp
+++ /dev/null
@@ -1,275 +0,0 @@
-#include "V8Utils.h"
-
-namespace v8 {
-
-static const char TAG[] = "V8Application";
-
-
-static int getLogLevelPriority(Logging::LoggingLevel loggingLevel) {
-    switch (loggingLevel) {
-        case Logging::LoggingLevel::INFO:
-          return ANDROID_LOG_INFO;
-        case Logging::LoggingLevel::WARNING:
-          return ANDROID_LOG_WARN;
-        case Logging::LoggingLevel::VERBOSE:
-          return ANDROID_LOG_DEBUG;
-        case Logging::LoggingLevel::ERROR:
-          return ANDROID_LOG_ERROR;
-    }
-
-    return ANDROID_LOG_INFO;
-}
-
-void LogForPriority(Logging::LoggingLevel loggingLevel, const char *formattedString, ...) {
-    if (Logging::getLevel() < loggingLevel) {
-        return ;
-    }
-
-    int priority = getLogLevelPriority(loggingLevel);
-
-    va_list variableListOfFormattedString;
-    va_start(variableListOfFormattedString, formattedString);
-    __android_log_vprint(priority, TAG, formattedString, variableListOfFormattedString);
-    va_end(variableListOfFormattedString);
-}
-
-Local<String> toLocalString(Isolate *isolate, const char *string) {
-    return String::NewFromUtf8(isolate, std::move(string));
-}
-
-Local<String> toLocalString(Isolate *isolate, const std::string &string) {
-    return String::NewFromUtf8(isolate, string.c_str(), NewStringType::kNormal,
-                        static_cast<int>(string.length())).ToLocalChecked();
-}
-
-Local<String> toLocalString(Isolate *isolate, const facebook::react::JSBigString &bigString) {
-    return String::NewFromUtf8(isolate, std::move(bigString.c_str()));
-}
-
-std::string toStdString(const Local<String> &string) {
-    int utfLen = string->Utf8Length();
-    std::string result;
-    result.resize(utfLen);
-    char* dataPointer = const_cast<char*>(result.data());
-    string->WriteUtf8(dataPointer, utfLen);
-    return result;
-}
-
-std::string toJsonStdString(Local<Context> context, const Local<Object> &object) {
-    LOGV("toJsonStdString start");
-
-    Local<String> jsonStr = v8::JSON::Stringify(context, std::move(object)).ToLocalChecked();
-    LOGV("toJsonStdString end");
-    return toStdString(std::move(jsonStr));
-}
-
-Local<String> toJsonString(Local<Context> context, const Local<Object> &object) {
-    return v8::JSON::Stringify(context, std::move(object)).ToLocalChecked();
-}
-
-Local<Value> fromJsonString(Isolate *isolate, Local<Context> context, const std::string &jsonStr) {
-    Local<String> res = String::NewFromUtf8(isolate, std::move(jsonStr.c_str()));
-    return v8::JSON::Parse(context, std::move(res)).ToLocalChecked();
-}
-
-Local<Value> fromJsonString(Isolate *isolate, Local<Context> context, const char *jsonStr) {
-    Local<String> res = String::NewFromUtf8(isolate, std::move(jsonStr));
-    return v8::JSON::Parse(context, std::move(res)).ToLocalChecked();
-}
-
-Local<Value> fromJsonString(Isolate *isolate, Local<Context> context, const char *jsonStr, int length) {
-    Local<String> res = String::NewFromUtf8(isolate, std::move(jsonStr), v8::NewStringType::kNormal, length).ToLocalChecked();
-    return v8::JSON::Parse(context, std::move(res)).ToLocalChecked();
-}
-
-Local<Value> fromJsonString(Local<Context> context, const Local<String> &jsonStr) {
-    return v8::JSON::Parse(context, std::move(jsonStr)).ToLocalChecked();
-}
-
-Local<Value> fromDynamic(Isolate *isolate, Local<v8::Context> context, const folly::dynamic &value) {
-    const std::string &json = folly::toJson(std::move(value));
-    Local<Value> result;
-    if (v8::JSON::Parse(context, toLocalString(isolate, std::move(json))).ToLocal(&result)) {
-        return result;
-    }
-    return Local<Value>();
-}
-
-Local<Value> safeToLocal(const MaybeLocal<Value> &maybeLocal) {
-    Local<Value> res;
-    if(maybeLocal.ToLocal(&res)) {
-        return res;
-    }
-    return Local<Value>();
-}
-
-void nativeLog(const FunctionCallbackInfo<Value> &args) {
-    android_LogPriority logLevel = ANDROID_LOG_DEBUG;
-    if (args.Length() > 1) {
-        int32_t level = Int32::Cast(*(args[1]))->Value();
-        // The lowest log level we get from JS is 0. We shift and cap it to be
-        // in the range the Android logging method expects.
-        logLevel = std::min(static_cast<android_LogPriority>(level + ANDROID_LOG_DEBUG), ANDROID_LOG_FATAL);
-    }
-    if (args.Length() > 0) {
-        Local<String> log = Local<String>::Cast(args[0]);
-        const std::string &str = toStdString(log);
-        __android_log_print(logLevel, "ReactNativeJS", "%s", str.c_str());
-    }
-}
-
-std::pair<Local<Uint32>, Local<Uint32>> parseNativeRequireParameters(const v8::FunctionCallbackInfo<v8::Value> &args) {
-    Local<Uint32> moduleId, bundleId;
-
-    if (args.Length() == 1) {
-        moduleId = Local<Uint32>::Cast(args[0]);
-    } else if (args.Length() == 2) {
-        moduleId = Local<Uint32>::Cast(args[0]);
-        bundleId = Local<Uint32>::Cast(args[1]);
-    } else {
-        throw std::invalid_argument("Got wrong number of args");
-    }
-
-    return std::make_pair(static_cast<Local<Uint32>>(bundleId), static_cast<Local<Uint32>>(moduleId));
-}
-
-void printType(Local<Value> value, const char *desc) {
-    if (!*value) {
-        LOGV("V8Executor  %s is null", desc);
-        return;
-    }
-    if (value->IsFunction()) {
-        LOGV("V8Executor  %s is a IsFunction", desc);
-    }
-    if (value->IsObject()) {
-        LOGV("V8Executor  %s is a object", desc);
-    }
-    if (value->IsArgumentsObject()) {
-        LOGV("V8Executor  %s is a IsArgumentsObject", desc);
-    }
-    if (value->IsArray()) {
-        LOGV("V8Executor  %s is a IsArray", desc);
-    }
-    if (value->IsArrayBuffer()) {
-        LOGV("V8Executor  %s is a IsArrayBuffer", desc);
-    }
-    if (value->IsAsyncFunction()) {
-        LOGV("V8Executor  %s is a IsAsyncFunction", desc);
-    }
-    if (value->IsBoolean()) {
-        LOGV("V8Executor  %s is a IsBoolean", desc);
-    }
-    if (value->IsBooleanObject()) {
-        LOGV("V8Executor  %s is a IsBooleanObject", desc);
-    }
-    if (value->IsDataView()) {
-        LOGV("V8Executor  %s is a IsDataView", desc);
-    }
-    if (value->IsDate()) {
-        LOGV("V8Executor  %s is a IsDate", desc);
-    }
-    if (value->IsExternal()) {
-        LOGV("V8Executor  %s is a IsExternal", desc);
-    }
-    if (value->IsFloat32Array()) {
-        LOGV("V8Executor  %s is a IsFloat32Array", desc);
-    }
-    if (value->IsGeneratorFunction()) {
-        LOGV("V8Executor  %s is a IsGeneratorFunction", desc);
-    }
-    if (value->IsGeneratorObject()) {
-        LOGV("V8Executor  %s is a IsGeneratorObject", desc);
-    }
-    if (value->IsInt8Array()) {
-        LOGV("V8Executor  %s is a IsInt8Array", desc);
-    }
-    if (value->IsInt16Array()) {
-        LOGV("V8Executor  %s is a IsInt16Array", desc);
-    }
-    if (value->IsFloat64Array()) {
-        LOGV("V8Executor  %s is a IsFloat64Array", desc);
-    }
-    if (value->IsInt32()) {
-        LOGV("V8Executor  %s is a IsInt32", desc);
-    }
-    if (value->IsInt32Array()) {
-        LOGV("V8Executor  %s is a IsInt32Array", desc);
-    }
-    if (value->IsMap()) {
-        LOGV("V8Executor  %s is a IsMap", desc);
-    }
-    if (value->IsMapIterator()) {
-        LOGV("V8Executor  %s is a IsMapIterator", desc);
-    }
-    if (value->IsNumber()) {
-        LOGV("V8Executor  %s is a IsNumber", desc);
-    }
-    if (value->IsNativeError()) {
-        LOGV("V8Executor  %s is a IsNativeError", desc);
-    }
-    if (value->IsNumberObject()) {
-        LOGV("V8Executor  %s is a IsNumberObject", desc);
-    }
-    if (value->IsName()) {
-        LOGV("V8Executor  %s is a IsName", desc);
-    }
-    if (value->IsNull()) {
-        LOGV("V8Executor  %s is a IsNull", desc);
-    }
-    if (value->IsPromise()) {
-        LOGV("V8Executor  %s is a IsPromise", desc);
-    }
-    if (value->IsProxy()) {
-        LOGV("V8Executor  %s is a IsProxy", desc);
-    }
-    if (value->IsSet()) {
-        LOGV("V8Executor  %s is a IsSet", desc);
-    }
-    if (value->IsSetIterator()) {
-        LOGV("V8Executor  %s is a IsSetIterator", desc);
-    }
-    if (value->IsString()) {
-        LOGV("V8Executor  %s is a IsString", desc);
-    }
-    if (value->IsStringObject()) {
-        LOGV("V8Executor  %s is a IsStringObject", desc);
-    }
-    if (value->IsSymbol()) {
-        LOGV("V8Executor  %s is a IsSymbol", desc);
-    }
-    if (value->IsSymbolObject()) {
-        LOGV("V8Executor  %s is a IsSymbolObject", desc);
-    }
-    if (value->IsTypedArray()) {
-        LOGV("V8Executor  %s is a IsTypedArray", desc);
-    }
-    if (value->IsUint8Array()) {
-        LOGV("V8Executor  %s is a IsUint8Array", desc);
-    }
-    if (value->IsUint8ClampedArray()) {
-        LOGV("V8Executor  %s is a IsUint8ClampedArray", desc);
-    }
-    if (value->IsUint16Array()) {
-        LOGV("V8Executor  %s is a IsUint16Array", desc);
-    }
-    if (value->IsUint32()) {
-        LOGV("V8Executor  %s is a IsUint32", desc);
-    }
-    if (value->IsUint32Array()) {
-        LOGV("V8Executor  %s is a IsUint32Array", desc);
-    }
-    if (value->IsUndefined()) {
-        LOGV("V8Executor  %s is a IsUndefined", desc);
-    }
-    if (value->IsWeakMap()) {
-        LOGV("V8Executor  %s is a IsWeakMap", desc);
-    }
-    if (value->IsWeakSet()) {
-        LOGV("V8Executor  %s is a IsWeakSet", desc);
-    }
-    if (value->IsWebAssemblyCompiledModule()) {
-        LOGV("V8Executor  %s is a IsWebAssemblyCompiledModule", desc);
-    }
-}
-
-}
diff --git a/ReactCommon/v8helpers/V8Utils.h b/ReactCommon/v8helpers/V8Utils.h
deleted file mode 100644
index 1c99b2afacc3..000000000000
--- a/ReactCommon/v8helpers/V8Utils.h
+++ /dev/null
@@ -1,63 +0,0 @@
-#ifndef V8_UTILS_H
-#define V8_UTILS_H
-
-#include "v8.h"
-#include <string>
-
-#include <android/log.h>
-#include <cxxreact/JSBigString.h>
-#include <cxxreact/Platform.h>
-#include <folly/json.h>
-#include <folly/Exception.h>
-#include <folly/Memory.h>
-#include <folly/String.h>
-#include <folly/Conv.h>
-#include <fcntl.h>
-
-using namespace facebook::react;
-
-#define LOGI(...) do { \
-  LogForPriority(Logging::LoggingLevel::INFO, __VA_ARGS__);\
-  } while(0)
-#define LOGV(...) do { \
-  LogForPriority(Logging::LoggingLevel::VERBOSE, __VA_ARGS__);\
-  } while(0)
-
-#define LOGW(...) do { \
-  LogForPriority(Logging::LoggingLevel::WARNING, __VA_ARGS__);\
-  } while(0)
-namespace v8 {
-
-  void LogForPriority(Logging::LoggingLevel loggingLevel, const char *fmt, ...);
-  
-  Local<String> toLocalString(Isolate *isolate, const char *string);
-
-  Local<String> toLocalString(Isolate *isolate, const std::string &string);
-
-  Local<String> toLocalString(Isolate *isolate, const facebook::react::JSBigString &bigString);
-
-  std::string toStdString(const Local<String> &string);
-
-  std::string toJsonStdString(Local<Context> context, const Local<Object> &object);
-
-  Local<String> toJsonString(Local<Context> context, const Local<Object> &object);
-
-  Local<Value> fromJsonString(Local<Context> context, const std::string &jsonStr);
-
-  Local<Value> fromJsonString(Isolate *isolate, Local<Context> context, const char *jsonStr);
-
-  Local<Value> fromJsonString(Isolate *isolate, Local<Context> context, const char *jsonStr, int length);
-
-  Local<Value> fromJsonString(Isolate *isolate, Local<Context> context, const Local<String> &jsonStr);
-
-  Local<Value> fromDynamic(Isolate *isolate, Local<v8::Context> context, const folly::dynamic &value);
-
-  Local<Value> safeToLocal(const MaybeLocal<Value> &maybeLocal);
-
-  std::pair<Local<Uint32>, Local<Uint32>> parseNativeRequireParameters(const v8::FunctionCallbackInfo<v8::Value> &args);
-
-  void nativeLog(const FunctionCallbackInfo<Value> &args);
-  void printType(Local<Value> value, const char *desc);
-}
-
-#endif //V8_UTILS_H
diff --git a/ReactCommon/v8helpers/android/V8Helpers.def b/ReactCommon/v8helpers/android/V8Helpers.def
deleted file mode 100644
index c1a6a1cd0675..000000000000
--- a/ReactCommon/v8helpers/android/V8Helpers.def
+++ /dev/null
@@ -1,47 +0,0 @@
-EXPORTS
-JSPokeSamplingProfiler
-JSStartSamplingProfilingOnMainJSCThread
-_ZN8facebook5react5Value11fromDynamicEPK15OpaqueJSContextRKN5folly7dynamicE
-_ZN8facebook5react5Value8fromJSONERKNS0_6StringE
-_ZN8facebook5react5Value9makeErrorEPK15OpaqueJSContextPKcS6_
-_ZN8facebook5react5ValueC1EPK15OpaqueJSContextP14OpaqueJSString
-_ZN8facebook5react5ValueC1EPK15OpaqueJSContextPK13OpaqueJSValue
-_ZN8facebook5react5ValueC2EPK15OpaqueJSContextP14OpaqueJSString
-_ZN8facebook5react5ValueC2EPK15OpaqueJSContextPK13OpaqueJSValue
-_ZN8facebook5react6Object11setPropertyEPKcRKNS0_5ValueE
-_ZN8facebook5react6Object11setPropertyERKNS0_6StringERKNS0_5ValueE
-_ZN8facebook5react6Object18setPropertyAtIndexEjRKNS0_5ValueE
-_ZN8facebook5react6Object6createEPK15OpaqueJSContext
-_ZN8facebook5react6Object8makeDateEPK15OpaqueJSContextNSt6chrono10time_pointINS5_3_V212system_clockENS5_8durationIxSt5ratioILx1ELx1000000000EEEEEE
-_ZN8facebook5react6Object9makeArrayEPK15OpaqueJSContextPPK13OpaqueJSValuej
-_ZNK8facebook5react5Value12toJSONStringEj
-_ZNK8facebook5react5Value7contextEv
-_ZNK8facebook5react5Value8asObjectEv
-_ZNK8facebook5react5Value8toStringEv
-_ZNK8facebook5react6Object11getPropertyEPKc
-_ZNK8facebook5react6Object11getPropertyERKNS0_6StringE
-_ZNK8facebook5react6Object14callAsFunctionEiPKPK13OpaqueJSValue
-_ZNK8facebook5react6Object14callAsFunctionEP13OpaqueJSValueiPKPKS2_
-_ZNK8facebook5react6Object14callAsFunctionERKS1_iPKPK13OpaqueJSValue
-_ZNK8facebook5react6Object14callAsFunctionERKS1_St16initializer_listIPK13OpaqueJSValueE
-_ZNK8facebook5react6Object14callAsFunctionESt16initializer_listIPK13OpaqueJSValueE
-_ZNK8facebook5react6Object16getPropertyNamesEv
-_ZNK8facebook5react6Object17callAsConstructorESt16initializer_listIPK13OpaqueJSValueE
-_ZNK8facebook5react6Object18getPropertyAtIndexEj
-_ZNK8facebook5react6Object9toJSONMapEv
-_ZNK8facebook5react6ObjectcvNS0_5ValueEEv
-_ZN8facebook5react7unicode11utf16toUTF8EPKtj
-_ZN8facebook5react11JSException12buildMessageEPK15OpaqueJSContextPK13OpaqueJSValueP14OpaqueJSStringPKc
-_ZN8facebook5react12makeFunctionEP15OpaqueJSContextPKcPFPK13OpaqueJSValuePKS1_PS5_SA_jPKS7_PS7_E
-_ZN8facebook5react12makeFunctionEPK15OpaqueJSContextPKcSt8functionIFPK13OpaqueJSValueS3_PS7_jPKS9_EE
-_ZN8facebook5react12removeGlobalEP15OpaqueJSContextPKc
-_ZN8facebook5react13JSContextLockC1EP15OpaqueJSContext
-_ZN8facebook5react13JSContextLockC2EP15OpaqueJSContext
-_ZN8facebook5react13JSContextLockD1Ev
-_ZN8facebook5react13JSContextLockD2Ev
-_ZN8facebook5react14evaluateScriptEPK15OpaqueJSContextP14OpaqueJSStringS5_
-_ZN8facebook5react18installGlobalProxyEP15OpaqueJSContextPKcPFPK13OpaqueJSValuePKS1_PS5_P14OpaqueJSStringPS7_E
-_ZN8facebook5react21installGlobalFunctionEP15OpaqueJSContextPKcPFPK13OpaqueJSValuePKS1_PS5_SA_jPKS7_PS7_E
-_ZN8facebook5react21installGlobalFunctionEP15OpaqueJSContextPKcSt8functionIFPK13OpaqueJSValuePKS1_PS6_jPKS8_EE
-_ZN8facebook5react37translatePendingCppExceptionToJSErrorEPK15OpaqueJSContextP13OpaqueJSValue
-_ZN8facebook5react37translatePendingCppExceptionToJSErrorEPK15OpaqueJSContextPKc
\ No newline at end of file