From 0374232592c6c358cdf4500144f9327a1874c238 Mon Sep 17 00:00:00 2001 From: Dulmandakh Date: Thu, 28 Jun 2018 11:29:07 +0800 Subject: [PATCH 1/4] bump NDK_TOOLCHAIN_VERSION to 4.9 --- ReactAndroid/src/main/jni/Application.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ReactAndroid/src/main/jni/Application.mk b/ReactAndroid/src/main/jni/Application.mk index 4f1b600b595b..4ad9bafd2441 100644 --- a/ReactAndroid/src/main/jni/Application.mk +++ b/ReactAndroid/src/main/jni/Application.mk @@ -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 From 5e210b7a6611835f25d33a8e196d04ea7cf69bd0 Mon Sep 17 00:00:00 2001 From: Dulmandakh Date: Thu, 28 Jun 2018 19:30:54 +0800 Subject: [PATCH 2/4] use generic compiler flags. etc c++11 instead of gnu++11 --- ReactAndroid/src/main/jni/first-party/fb/Android.mk | 2 +- ReactAndroid/src/main/jni/first-party/fbgloginit/Android.mk | 2 +- ReactAndroid/src/main/jni/third-party/folly/Android.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ReactAndroid/src/main/jni/first-party/fb/Android.mk b/ReactAndroid/src/main/jni/first-party/fb/Android.mk index 4540eef1d602..cf85de2f8781 100644 --- a/ReactAndroid/src/main/jni/first-party/fb/Android.mk +++ b/ReactAndroid/src/main/jni/first-party/fb/Android.mk @@ -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) diff --git a/ReactAndroid/src/main/jni/first-party/fbgloginit/Android.mk b/ReactAndroid/src/main/jni/first-party/fbgloginit/Android.mk index 6d08079a7ebc..be13e47a6f48 100644 --- a/ReactAndroid/src/main/jni/first-party/fbgloginit/Android.mk +++ b/ReactAndroid/src/main/jni/first-party/fbgloginit/Android.mk @@ -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) diff --git a/ReactAndroid/src/main/jni/third-party/folly/Android.mk b/ReactAndroid/src/main/jni/third-party/folly/Android.mk index 5692613c8dd1..a89e79eb6aa0 100644 --- a/ReactAndroid/src/main/jni/third-party/folly/Android.mk +++ b/ReactAndroid/src/main/jni/third-party/folly/Android.mk @@ -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 From 64232ac3ee770d733a68ab0567eae9b2b7cc151a Mon Sep 17 00:00:00 2001 From: Dulmandakh Date: Thu, 28 Jun 2018 19:31:53 +0800 Subject: [PATCH 3/4] boost compiler flag to c++11 --- ReactAndroid/src/main/jni/third-party/boost/Android.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ReactAndroid/src/main/jni/third-party/boost/Android.mk b/ReactAndroid/src/main/jni/third-party/boost/Android.mk index 35de5ae29b06..2485b648f9e6 100644 --- a/ReactAndroid/src/main/jni/third-party/boost/Android.mk +++ b/ReactAndroid/src/main/jni/third-party/boost/Android.mk @@ -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 From 6c6c94176f048379d2ce98168d9032ce050db860 Mon Sep 17 00:00:00 2001 From: Dulmandakh Date: Thu, 28 Jun 2018 19:44:25 +0800 Subject: [PATCH 4/4] buck compiler flag to c++1y --- .../src/main/java/com/facebook/react/fabric/jsc/jni/BUCK | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jsc/jni/BUCK b/ReactAndroid/src/main/java/com/facebook/react/fabric/jsc/jni/BUCK index 81f476d41d97..93a1a1c5ad5c 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/jsc/jni/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/jsc/jni/BUCK @@ -7,7 +7,7 @@ rn_xplat_cxx_library( compiler_flags = [ "-Wall", "-fexceptions", - "-std=gnu++1y", + "-std=c++1y", ], platforms = ANDROID, soname = "libfabricjscjni.$(ext)",