Skip to content

Commit ebe939b

Browse files
Kudofacebook-github-bot
authored andcommitted
Upgrade folly to fix NDK 21 build issue (#31802)
Summary: Upgrade folly for the facebook/folly#1593 fix for NDK 21 failure ## Changelog <!-- Help reviewers and the release process by writing your own changelog entry. For an example, see: https://github.com/facebook/react-native/wiki/Changelog --> [Android] [Changed] - Upgrade folly to 2021.06.28.00 Pull Request resolved: #31802 Test Plan: `./gradlew :ReactAndroid:installArchives` `./gradlew packages:rn-tester:android:app:installJscRelease` `./gradlew packages:rn-tester:android:app:installHermesRelease` Reviewed By: RSNara Differential Revision: D29547027 Pulled By: ShikaSD fbshipit-source-id: a10c7c65f459091bd0e7cca750a9b9e067189b73
1 parent bf2e1c9 commit ebe939b

File tree

4 files changed

+4
-37
lines changed

4 files changed

+4
-37
lines changed

ReactAndroid/build.gradle

-6
Original file line numberDiff line numberDiff line change
@@ -96,12 +96,6 @@ task prepareFolly(dependsOn: dependenciesPath ? [] : [downloadFolly], type: Copy
9696
eachFile { fname -> fname.path = (fname.path - "folly-${FOLLY_VERSION}/") }
9797
includeEmptyDirs = false
9898
into("$thirdPartyNdkDir/folly")
99-
doLast {
100-
ant.patch(
101-
patchfile: "src/main/jni/third-party/folly/FileUtil.cpp.patch",
102-
originalFile: "$thirdPartyNdkDir/folly/folly/FileUtil.cpp"
103-
)
104-
}
10599
}
106100

107101
task downloadFmt(dependsOn: createNativeDepsDirectories, type: Download) {

ReactAndroid/gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ SO_LOADER_VERSION=0.10.1
1717

1818
BOOST_VERSION=1_63_0
1919
DOUBLE_CONVERSION_VERSION=1.1.6
20-
FOLLY_VERSION=2021.04.26.00
20+
FOLLY_VERSION=2021.06.28.00
2121
FMT_VERSION=6.2.1
2222
LIBEVENT_VERSION=2.1.12
2323
GLOG_VERSION=0.3.5

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

+3-1
Original file line numberDiff line numberDiff line change
@@ -86,11 +86,13 @@ LOCAL_SRC_FILES := \
8686
folly/io/async/AsyncTimeout.cpp \
8787
folly/io/async/EventBase.cpp \
8888
folly/io/async/EventBaseBackendBase.cpp \
89+
folly/io/async/EventBaseLocal.cpp \
8990
folly/io/async/EventHandler.cpp \
9091
folly/io/async/HHWheelTimer.cpp \
9192
folly/io/async/Request.cpp \
9293
folly/io/async/TimeoutManager.cpp \
9394
folly/io/async/VirtualEventBase.cpp \
95+
folly/lang/Exception.cpp \
9496
folly/memory/MallctlHelper.cpp \
9597
folly/portability/SysMembarrier.cpp \
9698
folly/synchronization/AsymmetricMemoryBarrier.cpp \
@@ -106,7 +108,7 @@ LOCAL_SRC_FILES := \
106108
LOCAL_C_INCLUDES := $(LOCAL_PATH)
107109
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
108110

109-
LOCAL_CFLAGS += -fexceptions -fno-omit-frame-pointer -frtti -Wno-sign-compare
111+
LOCAL_CFLAGS += -fexceptions -fno-omit-frame-pointer -frtti -Wno-sign-compare -Wno-unused-variable
110112

111113
LOCAL_CFLAGS += $(FOLLY_FLAGS)
112114

ReactAndroid/src/main/jni/third-party/folly/FileUtil.cpp.patch

-29
This file was deleted.

0 commit comments

Comments
 (0)