diff --git a/ReactAndroid/gradle.properties b/ReactAndroid/gradle.properties index a7288da82b..0686f1ec1a 100644 --- a/ReactAndroid/gradle.properties +++ b/ReactAndroid/gradle.properties @@ -18,7 +18,7 @@ SO_LOADER_VERSION=0.8.0 BOOST_VERSION=1_63_0 DOUBLE_CONVERSION_VERSION=1.1.6 -FOLLY_VERSION=2018.10.22.00 +FOLLY_VERSION=2020.01.13.00 GLOG_VERSION=0.3.5 android.useAndroidX=true diff --git a/ReactAndroid/src/main/jni/third-party/folly/Android.mk b/ReactAndroid/src/main/jni/third-party/folly/Android.mk index 906abbb016..2688890637 100644 --- a/ReactAndroid/src/main/jni/third-party/folly/Android.mk +++ b/ReactAndroid/src/main/jni/third-party/folly/Android.mk @@ -9,20 +9,22 @@ LOCAL_SRC_FILES:= \ folly/memory/detail/MallocImpl.cpp \ folly/String.cpp \ folly/dynamic.cpp \ + folly/FileUtil.cpp \ folly/Format.cpp \ + folly/net/NetOps.cpp \ folly/json_pointer.cpp \ - folly/lang/ColdClass.cpp \ + folly/lang/CString.cpp \ + folly/lang/SafeAssert.cpp \ folly/detail/Demangle.cpp \ + folly/detail/UniqueInstance.cpp \ folly/hash/SpookyHashV2.cpp \ folly/container/detail/F14Table.cpp \ folly/ScopeGuard.cpp \ + folly/portability/SysUio.cpp ifeq ($(APP_OPTIM),debug) LOCAL_SRC_FILES += \ - folly/lang/Assume.cpp \ - folly/lang/SafeAssert.cpp \ - folly/FileUtil.cpp \ - folly/portability/SysUio.cpp + folly/lang/Assume.cpp endif LOCAL_C_INCLUDES := $(LOCAL_PATH) @@ -62,13 +64,16 @@ LOCAL_SRC_FILES := \ folly/Executor.cpp \ folly/SharedMutex.cpp \ folly/concurrency/CacheLocality.cpp \ + folly/detail/AsyncTrace.cpp \ folly/detail/AtFork.cpp \ folly/detail/Futex.cpp \ folly/detail/MemoryIdler.cpp \ folly/detail/StaticSingletonManager.cpp \ folly/detail/ThreadLocalDetail.cpp \ + folly/executors/ExecutorWithPriority.cpp \ folly/executors/InlineExecutor.cpp \ folly/executors/TimedDrivableExecutor.cpp \ + folly/executors/QueuedImmediateExecutor.cpp \ folly/io/async/Request.cpp \ folly/memory/MallctlHelper.cpp \ folly/portability/SysMembarrier.cpp \ @@ -83,7 +88,7 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) LOCAL_CFLAGS += -fexceptions -fno-omit-frame-pointer -frtti -Wno-sign-compare FOLLY_FLAGS += \ - -DFOLLY_FUTURE_USING_FIBER=0 + -DFOLLY_MOBILE=1 LOCAL_CFLAGS += $(FOLLY_FLAGS) diff --git a/ReactCommon/hermes/inspector/Inspector.cpp b/ReactCommon/hermes/inspector/Inspector.cpp index d61b8a6d04..607a5ca9e4 100644 --- a/ReactCommon/hermes/inspector/Inspector.cpp +++ b/ReactCommon/hermes/inspector/Inspector.cpp @@ -30,7 +30,7 @@ template class folly::Future; namespace folly { namespace futures { -Future sleep(Duration, Timekeeper *) { +SemiFuture sleep(Duration, Timekeeper *) { LOG(FATAL) << "folly::futures::sleep() not implemented"; }