Skip to content

Commit 6e2131b

Browse files
Kudofacebook-github-bot
authored andcommitted
Upgrade Folly to v2020.01.13.00 (#27811)
Summary: Upgrade Folly to v2020.01.13.00. Fixes #27640 ## Changelog [Android] [Changed] - Upgrade Folly to v2020.01.13.00 Pull Request resolved: #27811 Test Plan: Test by building and running RNTester: `./gradlew :RNTester:android:app:installJscDebug` `./gradlew :RNTester:android:app:installHermesDebug` And the native debug builds: `NATIVE_BUILD_TYPE=Debug ./gradlew :RNTester:android:app:installJscDebug` `NATIVE_BUILD_TYPE=Debug ./gradlew :RNTester:android:app:installHermesDebug` Reviewed By: mdvacca Differential Revision: D19474027 Pulled By: fkgozali fbshipit-source-id: 1c680dd80413b63aad66b587213de7499197177c
1 parent a3cb377 commit 6e2131b

File tree

3 files changed

+13
-8
lines changed

3 files changed

+13
-8
lines changed

ReactAndroid/gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ SO_LOADER_VERSION=0.8.0
1818

1919
BOOST_VERSION=1_63_0
2020
DOUBLE_CONVERSION_VERSION=1.1.6
21-
FOLLY_VERSION=2018.10.22.00
21+
FOLLY_VERSION=2020.01.13.00
2222
GLOG_VERSION=0.3.5
2323

2424
android.useAndroidX=true

ReactAndroid/src/main/jni/third-party/folly/Android.mk

+11-6
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,22 @@ LOCAL_SRC_FILES:= \
99
folly/memory/detail/MallocImpl.cpp \
1010
folly/String.cpp \
1111
folly/dynamic.cpp \
12+
folly/FileUtil.cpp \
1213
folly/Format.cpp \
14+
folly/net/NetOps.cpp \
1315
folly/json_pointer.cpp \
14-
folly/lang/ColdClass.cpp \
16+
folly/lang/CString.cpp \
17+
folly/lang/SafeAssert.cpp \
1518
folly/detail/Demangle.cpp \
19+
folly/detail/UniqueInstance.cpp \
1620
folly/hash/SpookyHashV2.cpp \
1721
folly/container/detail/F14Table.cpp \
1822
folly/ScopeGuard.cpp \
23+
folly/portability/SysUio.cpp
1924

2025
ifeq ($(APP_OPTIM),debug)
2126
LOCAL_SRC_FILES += \
22-
folly/lang/Assume.cpp \
23-
folly/lang/SafeAssert.cpp \
24-
folly/FileUtil.cpp \
25-
folly/portability/SysUio.cpp
27+
folly/lang/Assume.cpp
2628
endif
2729

2830
LOCAL_C_INCLUDES := $(LOCAL_PATH)
@@ -62,13 +64,16 @@ LOCAL_SRC_FILES := \
6264
folly/Executor.cpp \
6365
folly/SharedMutex.cpp \
6466
folly/concurrency/CacheLocality.cpp \
67+
folly/detail/AsyncTrace.cpp \
6568
folly/detail/AtFork.cpp \
6669
folly/detail/Futex.cpp \
6770
folly/detail/MemoryIdler.cpp \
6871
folly/detail/StaticSingletonManager.cpp \
6972
folly/detail/ThreadLocalDetail.cpp \
73+
folly/executors/ExecutorWithPriority.cpp \
7074
folly/executors/InlineExecutor.cpp \
7175
folly/executors/TimedDrivableExecutor.cpp \
76+
folly/executors/QueuedImmediateExecutor.cpp \
7277
folly/io/async/Request.cpp \
7378
folly/memory/MallctlHelper.cpp \
7479
folly/portability/SysMembarrier.cpp \
@@ -83,7 +88,7 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
8388
LOCAL_CFLAGS += -fexceptions -fno-omit-frame-pointer -frtti -Wno-sign-compare
8489

8590
FOLLY_FLAGS += \
86-
-DFOLLY_FUTURE_USING_FIBER=0
91+
-DFOLLY_MOBILE=1
8792

8893
LOCAL_CFLAGS += $(FOLLY_FLAGS)
8994

ReactCommon/hermes/inspector/Inspector.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ template class folly::Future<bool>;
3030
namespace folly {
3131
namespace futures {
3232

33-
Future<Unit> sleep(Duration, Timekeeper *) {
33+
SemiFuture<Unit> sleep(Duration, Timekeeper *) {
3434
LOG(FATAL) << "folly::futures::sleep() not implemented";
3535
}
3636

0 commit comments

Comments
 (0)