Skip to content

Commit ccdd450

Browse files
dulmandakhfacebook-github-bot
authored andcommittedJul 23, 2018
bump NDK toolchain to 4.9 (#19945)
Summary: This PR will bump NDK_TOOLCHAIN_VERSION to 4.9 or use GCC 4.9 to build C++ code. Once merged, we can bump folly to a newer version, which requires GCC 4.9. Pull Request resolved: #19945 Reviewed By: fkgozali Differential Revision: D8943282 Pulled By: hramos fbshipit-source-id: d239ca67a08788b12e115a9d78443b13a10403f6
1 parent 6da5779 commit ccdd450

File tree

6 files changed

+7
-6
lines changed

6 files changed

+7
-6
lines changed
 

‎ReactAndroid/src/main/java/com/facebook/react/fabric/jsc/jni/BUCK

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ rn_xplat_cxx_library(
77
compiler_flags = [
88
"-Wall",
99
"-fexceptions",
10-
"-std=gnu++1y",
10+
"-std=c++1y",
1111
],
1212
platforms = ANDROID,
1313
soname = "libfabricjscjni.$(ext)",

‎ReactAndroid/src/main/jni/Application.mk

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ NDK_MODULE_PATH := $(APP_MK_DIR)$(HOST_DIRSEP)$(THIRD_PARTY_NDK_DIR)$(HOST_DIRSE
1010
APP_STL := gnustl_shared
1111

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

15-
NDK_TOOLCHAIN_VERSION := 4.8
16+
NDK_TOOLCHAIN_VERSION := 4.9

‎ReactAndroid/src/main/jni/first-party/fb/Android.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ ifeq ($(TOOLCHAIN_PERMISSIVE),true)
3232
endif
3333
LOCAL_CFLAGS += -DHAVE_POSIX_CLOCKS
3434

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

3838
LOCAL_EXPORT_CPPFLAGS := $(CXX11_FLAGS)

‎ReactAndroid/src/main/jni/first-party/fbgloginit/Android.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
1010
LOCAL_CFLAGS := -fexceptions -fno-omit-frame-pointer
1111
LOCAL_CFLAGS += -Wall -Werror
1212

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

1616
LOCAL_EXPORT_CPPFLAGS := $(CXX11_FLAGS)

‎ReactAndroid/src/main/jni/third-party/boost/Android.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ include $(CLEAR_VARS)
33

44
LOCAL_C_INCLUDES := $(LOCAL_PATH)/boost_1_63_0
55
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/boost_1_63_0
6-
CXX11_FLAGS := -std=gnu++11
6+
CXX11_FLAGS := -std=c++11
77
LOCAL_EXPORT_CPPFLAGS := $(CXX11_FLAGS)
88

99
LOCAL_MODULE := boost

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
1616
LOCAL_CFLAGS += -fexceptions -fno-omit-frame-pointer -frtti
1717
LOCAL_CFLAGS += -Wall -Werror -std=c++11
1818

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

2222
FOLLY_FLAGS := -DFOLLY_NO_CONFIG=1 -DFOLLY_HAVE_CLOCK_GETTIME=1

0 commit comments

Comments
 (0)
Please sign in to comment.