Address folly and flipper version skew

Summary:
There's some incompatibilities which need to be fixed for real,
but this is a temporary fix to make the build work again.

Changelog: [Internal]

Reviewed By: willholen

Differential Revision: D18364011

fbshipit-source-id: c168e6496a504f9b00da0b9d758c50e2c6f314a4

ReactCommon/hermes/inspector/Android.mk

@@ -15,7 +15,7 @@ LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp $(LOCAL_PATH)/detail/*.cpp $(L
 
 LOCAL_C_ROOT := $(LOCAL_PATH)/../..
 
-LOCAL_CFLAGS := -DHERMES_ENABLE_DEBUGGER=1
+LOCAL_CFLAGS := -DHERMES_ENABLE_DEBUGGER=1 -DHERMES_INSPECTOR_FOLLY_KLUDGE=1
 LOCAL_C_INCLUDES := $(LOCAL_C_ROOT) $(REACT_NATIVE)/ReactCommon/jsi $(call find-node-module,$(LOCAL_PATH),hermes-engine)/android/include
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_C_ROOT)
 

ReactCommon/hermes/inspector/Inspector.cpp

@@ -16,12 +16,13 @@
 #include <hermes/inspector/detail/SerialExecutor.h>
 #include <hermes/inspector/detail/Thread.h>
 
+#ifdef HERMES_INSPECTOR_FOLLY_KLUDGE
 // <kludge> This is here, instead of linking against
 // folly/futures/Future.cpp, to avoid pulling in another pile of
 // dependencies, including the separate dependency libevent.  This is
 // likely specific to the version of folly RN uses, so may need to be
 // changed.  Even better, perhaps folly can be refactored to simplify
-// this.
+// this.  Providing a RN-specific Timekeeper impl may also help.
 
 template class folly::Future<folly::Unit>;
 template class folly::Future<bool>;
@@ -29,7 +30,7 @@ template class folly::Future<bool>;
 namespace folly {
 namespace futures {
 
-Future<Unit> sleep(Duration dur, Timekeeper *tk) {
+Future<Unit> sleep(Duration, Timekeeper *) {
   LOG(FATAL) << "folly::futures::sleep() not implemented";
 }
 
@@ -45,6 +46,7 @@ std::shared_ptr<Timekeeper> getTimekeeperSingleton() {
 } // namespace folly
 
 // </kludge>
+#endif
 
 namespace facebook {
 namespace hermes {