Refactor ReactMarker out of Platform

Reviewed By: fromcelticpark

Differential Revision: D7803908

fbshipit-source-id: 957e80519c209732b163ece2bccb7c8c36ff8107

ReactAndroid/src/main/jni/react/jni/Android.mk

@@ -9,6 +9,7 @@ LOCAL_SRC_FILES := \
   CatalystInstanceImpl.cpp \
   CxxModuleWrapper.cpp \
   JavaModuleWrapper.cpp \
+  JReactMarker.cpp \
   JMessageQueueThread.cpp \
   JSCPerfLogging.cpp \
   JSLoader.cpp \
@@ -22,7 +23,6 @@ LOCAL_SRC_FILES := \
   NativeMap.cpp \
   OnLoad.cpp \
   ProxyExecutor.cpp \
-  ReactMarker.cpp \
   ReadableNativeArray.cpp \
   ReadableNativeMap.cpp \
   WritableNativeArray.cpp \

ReactAndroid/src/main/jni/react/jni/AndroidJSCFactory.cpp

@@ -13,7 +13,7 @@
 
 #include "JSCPerfLogging.h"
 #include "JSLogging.h"
-#include "ReactMarker.h"
+#include "JReactMarker.h"
 
 using namespace facebook::jni;
 

ReactAndroid/src/main/jni/react/jni/BUCK

@@ -7,6 +7,7 @@ EXPORTED_HEADERS = [
     "CxxSharedModuleWrapper.h",
     "JavaModuleWrapper.h",
     "JavaScriptExecutorHolder.h",
+    "JReactMarker.h",
     "JSLoader.h",
     "JSLogging.h",
     "MethodInvoker.h",
@@ -14,7 +15,6 @@ EXPORTED_HEADERS = [
     "NativeArray.h",
     "NativeCommon.h",
     "NativeMap.h",
-    "ReactMarker.h",
     "ReadableNativeArray.h",
     "ReadableNativeMap.h",
     "WritableNativeArray.h",

ReactAndroid/src/main/jni/react/jni/JReactMarker.cpp

@@ -1,9 +1,8 @@
 // Copyright 2004-present Facebook. All Rights Reserved.
 
-#include "ReactMarker.h"
+#include "JReactMarker.h"
 #include <mutex>
-#include <cxxreact/Platform.h>
-#include <jschelpers/JSCHelpers.h>
+#include <cxxreact/ReactMarker.h>
 #include <fb/fbjni.h>
 
 namespace facebook {

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

@@ -4,7 +4,8 @@
 
 #include <string>
 #include <fb/fbjni.h>
-#include <cxxreact/Platform.h>
+
+#include <cxxreact/ReactMarker.h>
 
 namespace facebook {
 namespace react {