From d80ee0a8ac5afd3f24ffad6f64f3f50e0d6b1ceb Mon Sep 17 00:00:00 2001
From: Chris Hopman <cjhopman@fb.com>
Date: Tue, 9 Feb 2016 12:59:38 -0800
Subject: [PATCH] Clean up some includes/dependencies

Reviewed By: astreet

Differential Revision: D2905196

fb-gh-sync-id: d92f0e0296f4877b589cac674e388a5dbabc7d71
shipit-source-id: d92f0e0296f4877b589cac674e388a5dbabc7d71
---
 ReactAndroid/src/main/jni/react/BUCK             |  3 ---
 ReactAndroid/src/main/jni/react/JSCExecutor.cpp  | 11 +++++------
 ReactAndroid/src/main/jni/react/JSCWebWorker.cpp |  4 ----
 ReactAndroid/src/main/jni/react/Value.cpp        |  2 --
 ReactAndroid/src/main/jni/react/jni/BUCK         |  2 +-
 5 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/ReactAndroid/src/main/jni/react/BUCK b/ReactAndroid/src/main/jni/react/BUCK
index 42796146a3cf47..ffa06d775025bc 100644
--- a/ReactAndroid/src/main/jni/react/BUCK
+++ b/ReactAndroid/src/main/jni/react/BUCK
@@ -4,9 +4,6 @@ include_defs('//ReactAndroid/DEFS')
 SUPPORTED_PLATFORMS = '^android-(armv7|x86)$'
 
 DEPS = [
-  '//native/fb:fb',
-  '//native/jni:jni',
-  '//native/third-party/android-ndk:android',
   '//xplat/fbsystrace:fbsystrace',
   '//xplat/folly:molly',
   '//xplat/third-party/glog:glog',
diff --git a/ReactAndroid/src/main/jni/react/JSCExecutor.cpp b/ReactAndroid/src/main/jni/react/JSCExecutor.cpp
index c9b1c196623810..a951c5d8f4dfd2 100644
--- a/ReactAndroid/src/main/jni/react/JSCExecutor.cpp
+++ b/ReactAndroid/src/main/jni/react/JSCExecutor.cpp
@@ -6,18 +6,17 @@
 #include <atomic>
 #include <sstream>
 #include <string>
-#include <fb/log.h>
 #include <folly/json.h>
 #include <folly/String.h>
 #include <sys/time.h>
+
+#include "JSCHelpers.h"
 #include "Value.h"
-#include "jni/OnLoad.h"
-#include <react/JSCHelpers.h>
 #include "Platform.h"
 
 #ifdef WITH_JSC_EXTRA_TRACING
-#include <react/JSCTracing.h>
-#include <react/JSCLegacyProfiler.h>
+#include "JSCTracing.h"
+#include "JSCLegacyProfiler.h"
 #include <JavaScriptCore/API/JSProfilerPrivate.h>
 #endif
 
@@ -31,7 +30,7 @@ using fbsystrace::FbSystraceSection;
 #endif
 
 #ifdef WITH_FB_MEMORY_PROFILING
-#include <react/JSCMemory.h>
+#include "JSCMemory.h"
 #endif
 
 #ifdef WITH_FB_JSC_TUNING
diff --git a/ReactAndroid/src/main/jni/react/JSCWebWorker.cpp b/ReactAndroid/src/main/jni/react/JSCWebWorker.cpp
index 2c91d17fe32609..e8e710bdf39332 100644
--- a/ReactAndroid/src/main/jni/react/JSCWebWorker.cpp
+++ b/ReactAndroid/src/main/jni/react/JSCWebWorker.cpp
@@ -11,16 +11,12 @@
 #include <folly/Memory.h>
 
 #include "JSCHelpers.h"
-#include "jni/JSLoader.h"
-#include "jni/WebWorkers.h"
 #include "MessageQueueThread.h"
 #include "Platform.h"
 #include "Value.h"
 
 #include <JavaScriptCore/JSValueRef.h>
 
-using namespace facebook::jni;
-
 namespace facebook {
 namespace react {
 
diff --git a/ReactAndroid/src/main/jni/react/Value.cpp b/ReactAndroid/src/main/jni/react/Value.cpp
index d23490bbbc966d..ac07c486fd5cd4 100644
--- a/ReactAndroid/src/main/jni/react/Value.cpp
+++ b/ReactAndroid/src/main/jni/react/Value.cpp
@@ -2,8 +2,6 @@
 
 #include "Value.h"
 
-#include <jni/fbjni.h>
-
 #include "JSCHelpers.h"
 
 namespace facebook {
diff --git a/ReactAndroid/src/main/jni/react/jni/BUCK b/ReactAndroid/src/main/jni/react/jni/BUCK
index 69f13e78eaa584..bebdf54ce2a38f 100644
--- a/ReactAndroid/src/main/jni/react/jni/BUCK
+++ b/ReactAndroid/src/main/jni/react/jni/BUCK
@@ -45,11 +45,11 @@ jni_library(
     'JniJSModulesUnbundle.h',
     'JSCPerfLogging.h',
     'JSLogging.h',
+    'WebWorkers.h',
   ],
   exported_headers = [
     'NativeArray.h',
     'ReadableNativeArray.h',
-    'WebWorkers.h',
   ],
   preprocessor_flags = [
     '-DLOG_TAG="ReactNativeJNI"',