move inspector out of jschelpers

Differential Revision: D6385924

fbshipit-source-id: 1913d903077494cc0d86d5a8c8839620f1ecab0c

React.podspec

@@ -94,14 +94,21 @@ Pod::Spec.new do |s|
   end
 
   s.subspec "jschelpers_legacy" do |ss|
-    ss.source_files         = "ReactCommon/jschelpers/{JavaScriptCore,JSCWrapper,InspectorInterfaces}.{cpp,h}", "ReactCommon/jschelpers/systemJSCWrapper.cpp"
-    ss.private_header_files = "ReactCommon/jschelpers/{JavaScriptCore,JSCWrapper,InspectorInterfaces}.h"
+    ss.source_files         = "ReactCommon/jschelpers/{JavaScriptCore,JSCWrapper}.{cpp,h}", "ReactCommon/jschelpers/systemJSCWrapper.cpp"
+    ss.private_header_files = "ReactCommon/jschelpers/{JavaScriptCore,JSCWrapper}.h"
     ss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\"" }
     ss.framework            = "JavaScriptCore"
   end
 
+  s.subspec "jsinspector_legacy" do |ss|
+    ss.source_files         = "ReactCommon/jsinspector/{InspectorInterfaces}.{cpp,h}"
+    ss.private_header_files = "ReactCommon/jsinspector/{InspectorInterfaces}.h"
+    ss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\"" }
+  end
+
   s.subspec "cxxreact_legacy" do |ss|
     ss.dependency             "React/jschelpers_legacy"
+    ss.dependency             "React/jsinspector_legacy"
     ss.source_files         = "ReactCommon/cxxreact/{JSBundleType,oss-compat-util}.{cpp,h}"
     ss.private_header_files = "ReactCommon/cxxreact/{JSBundleType,oss-compat-util}.h"
     ss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\"" }
@@ -117,6 +124,12 @@ Pod::Spec.new do |s|
     ss.framework            = "JavaScriptCore"
   end
 
+  s.subspec "jsinspector" do |ss|
+    ss.source_files         = "ReactCommon/jsinspector/*.{cpp,h}"
+    ss.private_header_files = "ReactCommon/jsinspector/*.h"
+    ss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\"" }
+  end
+
   s.subspec "PrivateDatabase" do |ss|
     ss.source_files         = "ReactCommon/privatedata/*.{cpp,h}"
     ss.private_header_files = "ReactCommon/privatedata/*.h"
@@ -125,6 +138,7 @@ Pod::Spec.new do |s|
 
   s.subspec "cxxreact" do |ss|
     ss.dependency             "React/jschelpers"
+    ss.dependency             "React/jsinspector"
     ss.dependency             "boost"
     ss.dependency             "Folly", "2016.09.26.00"
     ss.compiler_flags       = folly_compiler_flags

React/Inspector/RCTInspector.mm

@@ -3,8 +3,8 @@
 
 #if RCT_DEV
 
-#include <jschelpers/InspectorInterfaces.h>
 #include <jschelpers/JavaScriptCore.h>
+#include <jsinspector/InspectorInterfaces.h>
 
 #import "RCTDefines.h"
 #import "RCTInspectorPackagerConnection.h"

ReactAndroid/src/main/jni/packagerconnection/BUCK

@@ -27,5 +27,6 @@ cxx_library(
         FBJNI_TARGET,
         "xplat//folly:molly",
         react_native_xplat_target("jschelpers:jschelpers"),
+        react_native_xplat_target("jsinspector:jsinspector"),
     ] + JSC_DEPS) if not IS_OSS_BUILD else [],
 )

ReactAndroid/src/main/jni/react/jni/JInspector.h

@@ -4,7 +4,7 @@
 
 #ifdef WITH_INSPECTOR
 
-#include <jschelpers/InspectorInterfaces.h>
+#include <jsinspector/InspectorInterfaces.h>
 
 #include <fb/fbjni.h>
 #include <folly/Memory.h>

ReactCommon/cxxreact/Android.mk

@@ -45,4 +45,5 @@ $(call import-module,folly)
 $(call import-module,jsc)
 $(call import-module,glog)
 $(call import-module,jschelpers)
+$(call import-module,jsinspector)
 $(call import-module,privatedata)

ReactCommon/cxxreact/BUCK

@@ -143,6 +143,7 @@ rn_xplat_cxx_library(
         "xplat//fbsystrace:fbsystrace",
         "xplat//folly:molly",
         react_native_xplat_target("jschelpers:jschelpers"),
+        react_native_xplat_target("jsinspector:jsinspector"),
         react_native_xplat_target("microprofiler:microprofiler"),
     ] + JSC_DEPS,
 )

ReactCommon/cxxreact/JSCExecutor.cpp

@@ -19,9 +19,9 @@
 #include <folly/Memory.h>
 #include <folly/String.h>
 #include <glog/logging.h>
-#include <jschelpers/InspectorInterfaces.h>
 #include <jschelpers/JSCHelpers.h>
 #include <jschelpers/Value.h>
+#include <jsinspector/InspectorInterfaces.h>
 
 #include "JSBigString.h"
 #include "JSBundleType.h"

ReactCommon/jschelpers/BUCK

@@ -1,7 +1,6 @@
 include_defs("//ReactCommon/DEFS")
 
 EXPORTED_HEADERS = [
-    "InspectorInterfaces.h",
     "JavaScriptCore.h",
     "JSCHelpers.h",
     "JSCWrapper.h",

ReactCommon/jsinspector/Android.mk

@@ -0,0 +1,18 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := jsinspector
+
+LOCAL_SRC_FILES := \
+  InspectorInterfaces.cpp
+
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/..
+LOCAL_EXPORT_C_INCLUDES := $(LOCAL_C_INCLUDES)
+
+LOCAL_CFLAGS += -Wall -Werror -fexceptions
+CXX11_FLAGS := -std=c++11
+LOCAL_CFLAGS += $(CXX11_FLAGS)
+LOCAL_EXPORT_CPPFLAGS := $(CXX11_FLAGS)
+
+include $(BUILD_SHARED_LIBRARY)

ReactCommon/jsinspector/BUCK

@@ -0,0 +1,26 @@
+include_defs("//ReactCommon/DEFS")
+
+EXPORTED_HEADERS = [
+    "InspectorInterfaces.h",
+]
+
+rn_xplat_cxx_library(
+    name = "jsinspector",
+    srcs = glob(
+        ["*.cpp"],
+    ),
+    headers = glob(
+        ["*.h"],
+        excludes = EXPORTED_HEADERS,
+    ),
+    header_namespace = "jsinspector",
+    exported_headers = EXPORTED_HEADERS,
+    compiler_flags = [
+        "-Wall",
+        "-fexceptions",
+        "-std=c++1y",
+    ],
+    visibility = [
+        "PUBLIC",
+    ],
+)

ReactCommon/jschelpers/InspectorInterfaces.h → ReactCommon/jsinspector/InspectorInterfaces.h

@@ -29,7 +29,7 @@ struct InspectorPage {
 
 class IRemoteConnection : public IDestructible {
 public:
-  __attribute__((visibility("default"))) virtual ~IRemoteConnection() = 0;
+  virtual ~IRemoteConnection() = 0;
   virtual void onMessage(std::string message) = 0;
   virtual void onDisconnect() = 0;
 };