From 8dc8f5af577c88e301f8fc267071d80bf1991640 Mon Sep 17 00:00:00 2001 From: Dulmandakh Date: Tue, 26 Jun 2018 15:01:37 +0800 Subject: [PATCH 1/3] bump ndk to r13b --- .circleci/config.yml | 6 +++--- ContainerShip/Dockerfile.android-base | 2 +- ReactAndroid/src/main/jni/Application.mk | 4 ++-- scripts/android-setup.sh | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4803f45845c7..1fdd8ac8a507 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -59,11 +59,11 @@ aliases: - &restore-cache-ndk keys: - - v3-android-ndk-{{ arch }}-r10e-{{ checksum "scripts/android-setup.sh" }} + - v3-android-ndk-{{ arch }}-r13b-{{ checksum "scripts/android-setup.sh" }} - &save-cache-ndk paths: - /opt/ndk - key: v3-android-ndk-{{ arch }}-r10e-{{ checksum "scripts/android-setup.sh" }} + key: v3-android-ndk-{{ arch }}-r13b-{{ checksum "scripts/android-setup.sh" }} - &restore-cache-buck keys: @@ -366,7 +366,7 @@ android_defaults: &android_defaults - ADB_INSTALL_TIMEOUT: 10 - _JAVA_OPTIONS: "-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap" - GRADLE_OPTS: '-Dorg.gradle.daemon=false -Dorg.gradle.jvmargs="-XX:+HeapDumpOnOutOfMemoryError"' - - ANDROID_NDK: '/opt/ndk/android-ndk-r10e' + - ANDROID_NDK: '/opt/ndk/android-ndk-r13b' - BUILD_THREADS: 2 macos_defaults: &macos_defaults diff --git a/ContainerShip/Dockerfile.android-base b/ContainerShip/Dockerfile.android-base index 78cb4dc22ca4..735324947400 100644 --- a/ContainerShip/Dockerfile.android-base +++ b/ContainerShip/Dockerfile.android-base @@ -21,7 +21,7 @@ ARG SDK_VERSION=sdk-tools-linux-3859397.zip ARG ANDROID_BUILD_VERSION=26 ARG ANDROID_TOOLS_VERSION=26.0.3 ARG BUCK_VERSION=v2018.06.25.01 -ARG NDK_VERSION=10e +ARG NDK_VERSION=13b ARG NODE_VERSION=8.10.0 ARG WATCHMAN_VERSION=4.9.0 diff --git a/ReactAndroid/src/main/jni/Application.mk b/ReactAndroid/src/main/jni/Application.mk index 4f1b600b595b..6cfece21e46e 100644 --- a/ReactAndroid/src/main/jni/Application.mk +++ b/ReactAndroid/src/main/jni/Application.mk @@ -8,8 +8,8 @@ APP_MK_DIR := $(dir $(lastword $(MAKEFILE_LIST))) NDK_MODULE_PATH := $(APP_MK_DIR)$(HOST_DIRSEP)$(THIRD_PARTY_NDK_DIR)$(HOST_DIRSEP)$(REACT_COMMON_DIR)$(HOST_DIRSEP)$(APP_MK_DIR)first-party APP_STL := gnustl_shared - +APP_CPPFLAGS := -std=c++1y # Make sure every shared lib includes a .note.gnu.build-id header APP_LDFLAGS := -Wl,--build-id -NDK_TOOLCHAIN_VERSION := 4.8 +NDK_TOOLCHAIN_VERSION := 4.9 diff --git a/scripts/android-setup.sh b/scripts/android-setup.sh index 6492173f3f8d..1ed04d7c32b5 100644 --- a/scripts/android-setup.sh +++ b/scripts/android-setup.sh @@ -33,7 +33,7 @@ function getAndroidNDK { if [ ! -e $DEPS ]; then cd $NDK_HOME echo "Downloading NDK..." - curl -o ndk.zip https://dl.google.com/android/repository/android-ndk-r10e-linux-x86_64.zip + curl -o ndk.zip https://dl.google.com/android/repository/android-ndk-r13b-linux-x86_64.zip unzip -o -q ndk.zip echo "Installed Android NDK at $NDK_HOME" touch $DEPS From 154c56d302abe20bad18b709fff0168cbd216c0f Mon Sep 17 00:00:00 2001 From: Dulmandakh Date: Tue, 26 Jun 2018 16:03:06 +0800 Subject: [PATCH 2/3] replace gcc specific compiler flags with generic ones --- .../src/main/java/com/facebook/react/fabric/jsc/jni/BUCK | 2 +- 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/boost/Android.mk | 2 +- ReactAndroid/src/main/jni/third-party/folly/Android.mk | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) 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)", 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/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 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 5f5b8f42798afb01e3ce0b8403382c13c187a2a4 Mon Sep 17 00:00:00 2001 From: Dulmandakh Date: Wed, 27 Jun 2018 14:36:45 +0800 Subject: [PATCH 3/3] bump ndk to r14b --- .circleci/config.yml | 6 +++--- ContainerShip/Dockerfile.android-base | 2 +- scripts/android-setup.sh | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1fdd8ac8a507..949c46e193d0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -59,11 +59,11 @@ aliases: - &restore-cache-ndk keys: - - v3-android-ndk-{{ arch }}-r13b-{{ checksum "scripts/android-setup.sh" }} + - v3-android-ndk-{{ arch }}-r14b-{{ checksum "scripts/android-setup.sh" }} - &save-cache-ndk paths: - /opt/ndk - key: v3-android-ndk-{{ arch }}-r13b-{{ checksum "scripts/android-setup.sh" }} + key: v3-android-ndk-{{ arch }}-r14b-{{ checksum "scripts/android-setup.sh" }} - &restore-cache-buck keys: @@ -366,7 +366,7 @@ android_defaults: &android_defaults - ADB_INSTALL_TIMEOUT: 10 - _JAVA_OPTIONS: "-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap" - GRADLE_OPTS: '-Dorg.gradle.daemon=false -Dorg.gradle.jvmargs="-XX:+HeapDumpOnOutOfMemoryError"' - - ANDROID_NDK: '/opt/ndk/android-ndk-r13b' + - ANDROID_NDK: '/opt/ndk/android-ndk-r14b' - BUILD_THREADS: 2 macos_defaults: &macos_defaults diff --git a/ContainerShip/Dockerfile.android-base b/ContainerShip/Dockerfile.android-base index 735324947400..3ac069b7473d 100644 --- a/ContainerShip/Dockerfile.android-base +++ b/ContainerShip/Dockerfile.android-base @@ -21,7 +21,7 @@ ARG SDK_VERSION=sdk-tools-linux-3859397.zip ARG ANDROID_BUILD_VERSION=26 ARG ANDROID_TOOLS_VERSION=26.0.3 ARG BUCK_VERSION=v2018.06.25.01 -ARG NDK_VERSION=13b +ARG NDK_VERSION=14b ARG NODE_VERSION=8.10.0 ARG WATCHMAN_VERSION=4.9.0 diff --git a/scripts/android-setup.sh b/scripts/android-setup.sh index 1ed04d7c32b5..39676c526417 100644 --- a/scripts/android-setup.sh +++ b/scripts/android-setup.sh @@ -33,7 +33,7 @@ function getAndroidNDK { if [ ! -e $DEPS ]; then cd $NDK_HOME echo "Downloading NDK..." - curl -o ndk.zip https://dl.google.com/android/repository/android-ndk-r13b-linux-x86_64.zip + curl -o ndk.zip https://dl.google.com/android/repository/android-ndk-r14b-linux-x86_64.zip unzip -o -q ndk.zip echo "Installed Android NDK at $NDK_HOME" touch $DEPS