Separate V8 code from the core JSI library (facebook#64)

mganandraj · May 13, 2019 · 1e6ff28 · 1e6ff28
1 parent b12a210
commit 1e6ff28
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 18 deletions.
diff --git a/ReactCommon/jsi/V8Runtime_droid.cpp b/ReactCommon/jsi/V8Runtime_droid.cpp
@@ -149,4 +149,8 @@ namespace facebook { namespace v8runtime {
 
     return script;
   }
+
+  std::unique_ptr<jsi::Runtime> makeV8Runtime(const folly::dynamic& v8Config) {
+    return std::make_unique<V8Runtime>(v8Config);
+  }
 }} // namespace facebook::v8runtime
diff --git a/ReactCommon/jsi/V8Runtime_shared.cpp b/ReactCommon/jsi/V8Runtime_shared.cpp
@@ -739,8 +739,4 @@ namespace facebook { namespace v8runtime {
   std::unique_ptr<jsi::Runtime> makeV8Runtime() {
     return std::make_unique<V8Runtime>();
   }
-
-  std::unique_ptr<jsi::Runtime> makeV8Runtime(const folly::dynamic& v8Config) {
-    return std::make_unique<V8Runtime>(v8Config);
-  }
 }} // namespace facebook::v8runtime
diff --git a/ReactCommon/jsi/V8Runtime_win.cpp b/ReactCommon/jsi/V8Runtime_win.cpp
@@ -23,4 +23,7 @@ namespace facebook { namespace v8runtime {
     std::abort();
   }
 
+  std::unique_ptr<jsi::Runtime> makeV8Runtime(const folly::dynamic& v8Config) {
+    return std::make_unique<V8Runtime>(v8Config);
+  }
 }} // namespace facebook::v8runtime
diff --git a/ReactCommon/jsi/dirs b/ReactCommon/jsi/dirs
@@ -1,5 +1,6 @@
 DIRS = \
     android{droidarm,droidarm64,droidx64,droidx86} \
     jsicore{apple,chpe,x64,x86} \
+    jsiv8{apple,chpe,x64,x86} \
     win32{apple,chpe,x64,x86} \
     winrt{arm,x64,x86} \
diff --git a/ReactCommon/jsi/jsicore/sources b/ReactCommon/jsi/jsicore/sources
@@ -2,19 +2,6 @@ LIBLET_WIN32 = 1
 LIBLET_DEF_NOEXPORTS = 1
 LIBLET_SUFFIX = core
 
-C_DEFINES=$(C_DEFINES) -DJSI_CORE
-
-V8_ENABLED = 1
-
-# Currently this nuget package is windows only.
-!LISTFILES -recursive V8_HEADERS = $(PKGOFFICE_GOOGLE_V8_1_6_0_0)\build\include *.h
-
-HEADERS = $(HEADERS) \
-    $(V8_HEADERS) \
-
-INCLUDES = $(INCLUDES); \
-    $(PKGOFFICE_GOOGLE_V8_1_6_0_0)\build\include; \
-
 !include ..\sources.inc
 
 SOURCES = $(SOURCES_JSICORE)
diff --git a/ReactCommon/jsi/jsiv8/sources b/ReactCommon/jsi/jsiv8/sources
@@ -0,0 +1,18 @@
+LIBLET_WIN32 = 1
+LIBLET_DEF_NOEXPORTS = 1
+LIBLET_SUFFIX = v8
+
+C_DEFINES=$(C_DEFINES) -DJSI_CORE
+
+# Currently this nuget package is windows only.
+!LISTFILES -recursive V8_HEADERS = $(PKGOFFICE_GOOGLE_V8_1_6_0_0)\build\include *.h
+
+HEADERS = $(HEADERS) \
+    $(V8_HEADERS) \
+
+INCLUDES = $(INCLUDES); \
+    $(PKGOFFICE_GOOGLE_V8_1_6_0_0)\build\include; \
+
+!include ..\sources.inc
+
+SOURCES = $(SOURCES_JSIV8)
diff --git a/ReactCommon/jsi/sources.inc b/ReactCommon/jsi/sources.inc
@@ -28,6 +28,7 @@ SOURCES_ANDROID = \
 SOURCES_ANDROID = \
   $(SOURCES_SHARED);\
   $(SOURCES_JSC_FILES); \
+
 !endif
 
 SOURCES_WIN32 = \
@@ -41,6 +42,8 @@ SOURCES_WINRT = \
 
 SOURCES_JSICORE = \
   ..\jsi.cpp \
+
+SOURCES_JSIV8 = \
   ..\V8Platform.cpp \
   ..\V8Runtime_basic.cpp \
-  ..\V8Runtime_shared.cpp \
+  ..\V8Runtime_shared.cpp \