Skip to content

Commit

Permalink
Upgrade folly to fix NDK 21 build issue (#31802)
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Kudo authored and facebook-github-bot committed Jul 6, 2021
1 parent bf2e1c9 commit ebe939b
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 37 deletions.
6 changes: 0 additions & 6 deletions ReactAndroid/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -96,12 +96,6 @@ task prepareFolly(dependsOn: dependenciesPath ? [] : [downloadFolly], type: Copy
eachFile { fname -> fname.path = (fname.path - "folly-${FOLLY_VERSION}/") }
includeEmptyDirs = false
into("$thirdPartyNdkDir/folly")
doLast {
ant.patch(
patchfile: "src/main/jni/third-party/folly/FileUtil.cpp.patch",
originalFile: "$thirdPartyNdkDir/folly/folly/FileUtil.cpp"
)
}
}

task downloadFmt(dependsOn: createNativeDepsDirectories, type: Download) {
Expand Down
2 changes: 1 addition & 1 deletion ReactAndroid/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ SO_LOADER_VERSION=0.10.1

BOOST_VERSION=1_63_0
DOUBLE_CONVERSION_VERSION=1.1.6
FOLLY_VERSION=2021.04.26.00
FOLLY_VERSION=2021.06.28.00
FMT_VERSION=6.2.1
LIBEVENT_VERSION=2.1.12
GLOG_VERSION=0.3.5
Expand Down
4 changes: 3 additions & 1 deletion ReactAndroid/src/main/jni/third-party/folly/Android.mk
Original file line number Diff line number Diff line change
Expand Up @@ -86,11 +86,13 @@ LOCAL_SRC_FILES := \
folly/io/async/AsyncTimeout.cpp \
folly/io/async/EventBase.cpp \
folly/io/async/EventBaseBackendBase.cpp \
folly/io/async/EventBaseLocal.cpp \
folly/io/async/EventHandler.cpp \
folly/io/async/HHWheelTimer.cpp \
folly/io/async/Request.cpp \
folly/io/async/TimeoutManager.cpp \
folly/io/async/VirtualEventBase.cpp \
folly/lang/Exception.cpp \
folly/memory/MallctlHelper.cpp \
folly/portability/SysMembarrier.cpp \
folly/synchronization/AsymmetricMemoryBarrier.cpp \
Expand All @@ -106,7 +108,7 @@ LOCAL_SRC_FILES := \
LOCAL_C_INCLUDES := $(LOCAL_PATH)
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)

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

LOCAL_CFLAGS += $(FOLLY_FLAGS)

Expand Down
29 changes: 0 additions & 29 deletions ReactAndroid/src/main/jni/third-party/folly/FileUtil.cpp.patch

This file was deleted.

0 comments on commit ebe939b

Please sign in to comment.