Skip to content

Bump boost for Android to 1.76 to align with iOS + fix #33565

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
kelset wants to merge 6 commits into from
Closed

Bump boost for Android to 1.76 to align with iOS + fix #33565

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0c10aac
bump boost android side
kelset Apr 4, 2022
f6e0b7b
fix an iOS reference...?
kelset Apr 4, 2022
76fc1fc
let's try to change to use boost directly
kelset Apr 5, 2022
13ea04d
fix
kelset Apr 5, 2022
a8f1355
keep fixing
kelset Apr 5, 2022
7a49096
remove leftover comment
kelset Apr 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion React/third-party.xcconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@
// LICENSE file in the root directory of this source tree.
//

HEADER_SEARCH_PATHS = $(SRCROOT)/../third-party/boost_1_63_0 $(SRCROOT)/../third-party/folly-2021.06.28.00 $(SRCROOT)/../third-party/glog-0.3.5/src
HEADER_SEARCH_PATHS = $(SRCROOT)/../third-party/boost_1_76_0 $(SRCROOT)/../third-party/folly-2021.06.28.00 $(SRCROOT)/../third-party/glog-0.3.5/src
OTHER_CFLAGS = -DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1
2 changes: 1 addition & 1 deletion ReactAndroid/Android-prebuilt.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ include $(CLEAR_VARS)
LOCAL_MODULE := folly_runtime
LOCAL_SRC_FILES := $(REACT_NDK_EXPORT_DIR)/$(TARGET_ARCH_ABI)/libfolly_runtime.so
LOCAL_EXPORT_C_INCLUDES := \
$(THIRD_PARTY_NDK_DIR)/boost/boost_1_63_0 \
$(THIRD_PARTY_NDK_DIR)/boost/boost_1_76_0 \
$(THIRD_PARTY_NDK_DIR)/double-conversion \
$(THIRD_PARTY_NDK_DIR)/folly
# Note: Sync with folly/Android.mk.
Expand Down
4 changes: 2 additions & 2 deletions ReactAndroid/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ def downloadsDir = customDownloadsDir ? new File(customDownloadsDir) : new File(
def thirdPartyNdkDir = new File("$buildDir/third-party-ndk")

// You need to have following folders in this directory:
// - boost_1_63_0
// - boost_1_76_0
// - double-conversion-1.1.6
// - folly-deprecate-dynamic-initializer
// - glog-0.3.5
Expand All @@ -55,7 +55,7 @@ task createNativeDepsDirectories {
}

task downloadBoost(dependsOn: createNativeDepsDirectories, type: Download) {
src("https://github.com/react-native-community/boost-for-react-native/releases/download/v${BOOST_VERSION.replace("_", ".")}-0/boost_${BOOST_VERSION}.tar.gz")
src("https://boostorg.jfrog.io/artifactory/main/release/${BOOST_VERSION.replace("_", ".")}/source/boost_${BOOST_VERSION}.tar.gz")
onlyIfNewer(true)
overwrite(false)
dest(new File(downloadsDir, "boost_${BOOST_VERSION}.tar.gz"))
Expand Down
2 changes: 1 addition & 1 deletion ReactAndroid/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ FRESCO_VERSION=2.5.0
OKHTTP_VERSION=4.9.2
SO_LOADER_VERSION=0.10.3

BOOST_VERSION=1_63_0
BOOST_VERSION=1_76_0
DOUBLE_CONVERSION_VERSION=1.1.6
FOLLY_VERSION=2021.06.28.00
FMT_VERSION=6.2.1
Expand Down
4 changes: 2 additions & 2 deletions ReactAndroid/src/main/jni/third-party/boost/Android.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ include $(CLEAR_VARS)
# They are required for Folly futures to compile successfully.
LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/asm/$(TARGET_ARCH_ABI)/*.S)

LOCAL_C_INCLUDES := $(LOCAL_PATH)/boost_1_63_0
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/boost_1_63_0
LOCAL_C_INCLUDES := $(LOCAL_PATH)/boost_1_76_0
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/boost_1_76_0

LOCAL_MODULE := boost

Expand Down
2 changes: 1 addition & 1 deletion ReactAndroid/src/main/jni/third-party/boost/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ add_library(boost STATIC ${boostasm_SRC})

set_target_properties(boost PROPERTIES LINKER_LANGUAGE CXX)

target_include_directories(boost PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/boost_1_63_0)
target_include_directories(boost PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/boost_1_76_0)