Skip to content

bump NDK toolchain to 4.9 #19945

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
wants to merge 5 commits into from
Closed

bump NDK toolchain to 4.9 #19945

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0374232
bump NDK_TOOLCHAIN_VERSION to 4.9
dulmandakh Jun 28, 2018
a58a5ee
Merge branch 'master' into bump-ndk-toolchain-49
dulmandakh Jun 28, 2018
5e210b7
use generic compiler flags. etc c++11 instead of gnu++11
dulmandakh Jun 28, 2018
64232ac
boost compiler flag to c++11
dulmandakh Jun 28, 2018
6c6c941
buck compiler flag to c++1y
dulmandakh Jun 28, 2018
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 ReactAndroid/src/main/java/com/facebook/react/fabric/jsc/jni/BUCK
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ rn_xplat_cxx_library(
compiler_flags = [
"-Wall",
"-fexceptions",
"-std=gnu++1y",
"-std=c++1y",
],
platforms = ANDROID,
soname = "libfabricjscjni.$(ext)",
Expand Down
3 changes: 2 additions & 1 deletion ReactAndroid/src/main/jni/Application.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ NDK_MODULE_PATH := $(APP_MK_DIR)$(HOST_DIRSEP)$(THIRD_PARTY_NDK_DIR)$(HOST_DIRSE
APP_STL := gnustl_shared

# Make sure every shared lib includes a .note.gnu.build-id header
APP_CPPFLAGS := -std=c++1y
APP_LDFLAGS := -Wl,--build-id

NDK_TOOLCHAIN_VERSION := 4.8
NDK_TOOLCHAIN_VERSION := 4.9
2 changes: 1 addition & 1 deletion ReactAndroid/src/main/jni/first-party/fb/Android.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ ifeq ($(TOOLCHAIN_PERMISSIVE),true)
endif
LOCAL_CFLAGS += -DHAVE_POSIX_CLOCKS

CXX11_FLAGS := -std=gnu++11
CXX11_FLAGS := -std=c++11
LOCAL_CFLAGS += $(CXX11_FLAGS)

LOCAL_EXPORT_CPPFLAGS := $(CXX11_FLAGS)
Expand Down
2 changes: 1 addition & 1 deletion ReactAndroid/src/main/jni/first-party/fbgloginit/Android.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
LOCAL_CFLAGS := -fexceptions -fno-omit-frame-pointer
LOCAL_CFLAGS += -Wall -Werror

CXX11_FLAGS := -std=gnu++11
CXX11_FLAGS := -std=c++11
LOCAL_CFLAGS += $(CXX11_FLAGS)

LOCAL_EXPORT_CPPFLAGS := $(CXX11_FLAGS)
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -3,7 +3,7 @@ include $(CLEAR_VARS)

LOCAL_C_INCLUDES := $(LOCAL_PATH)/boost_1_63_0
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/boost_1_63_0
CXX11_FLAGS := -std=gnu++11
CXX11_FLAGS := -std=c++11
LOCAL_EXPORT_CPPFLAGS := $(CXX11_FLAGS)

LOCAL_MODULE := boost
Expand Down
2 changes: 1 addition & 1 deletion ReactAndroid/src/main/jni/third-party/folly/Android.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
LOCAL_CFLAGS += -fexceptions -fno-omit-frame-pointer -frtti
LOCAL_CFLAGS += -Wall -Werror -std=c++11

CXX11_FLAGS := -std=gnu++11
CXX11_FLAGS := -std=c++11
LOCAL_CFLAGS += $(CXX11_FLAGS)

FOLLY_FLAGS := -DFOLLY_NO_CONFIG=1 -DFOLLY_HAVE_CLOCK_GETTIME=1
Expand Down