Skip to content

Commit 6117a6c

Browse files
dulmandakhfacebook-github-bot
dulmandakh
authored and
facebook-github-bot
committed
Bump Android NDK to r17b (#20357)
Summary: This PR bumps Android NDK version to r17b (latest). Cleaned up redundant **LOCAL_EXPORT_CPPFLAGS** rules in .mk files Pull Request resolved: #20357 Differential Revision: D9068424 Pulled By: hramos fbshipit-source-id: 8578637e38e807288b819a36cb75ea9feefcc09f
1 parent 1b09bd7 commit 6117a6c

File tree

21 files changed

+27
-69
lines changed

21 files changed

+27
-69
lines changed

‎.circleci/config.yml

+7-7
Original file line numberDiff line numberDiff line change
@@ -49,21 +49,21 @@ aliases:
4949

5050
- &restore-cache-ndk
5151
keys:
52-
- v3-android-ndk-r10e-{{ checksum "scripts/android-setup.sh" }}
52+
- v3-android-ndk-r17b-{{ checksum "scripts/android-setup.sh" }}
5353
- &save-cache-ndk
5454
paths:
5555
- /opt/ndk
56-
key: v3-android-ndk-r10e-{{ checksum "scripts/android-setup.sh" }}
56+
key: v3-android-ndk-r17b-{{ checksum "scripts/android-setup.sh" }}
5757

5858
- &restore-cache-downloads-buck
5959
keys:
60-
- v3-buck-v2018.06.25.01-{{ checksum "scripts/circleci/buck_fetch.sh" }}}
61-
- v3-buck-v2018.06.25.01-
60+
- v3-buck-v2018.07.23.01-{{ checksum "scripts/circleci/buck_fetch.sh" }}}
61+
- v3-buck-v2018.07.23.01-
6262
- &save-cache-downloads-buck
6363
paths:
6464
- ~/buck
6565
- ~/okbuck
66-
key: v3-buck-v2018.06.25.01-{{ checksum "scripts/circleci/buck_fetch.sh" }}
66+
key: v3-buck-v2018.07.23.01-{{ checksum "scripts/circleci/buck_fetch.sh" }}
6767

6868
- &restore-cache-watchman
6969
keys:
@@ -136,7 +136,7 @@ aliases:
136136
name: Install BUCK
137137
command: |
138138
if [[ ! -e ~/buck ]]; then
139-
git clone https://github.com/facebook/buck.git ~/buck --branch v2018.06.25.01 --depth=1
139+
git clone https://github.com/facebook/buck.git ~/buck --branch v2018.07.23.01 --depth=1
140140
fi
141141
cd ~/buck && ant
142142
buck --version
@@ -365,7 +365,7 @@ android_defaults: &android_defaults
365365
- ADB_INSTALL_TIMEOUT: 10
366366
- _JAVA_OPTIONS: "-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap"
367367
- GRADLE_OPTS: '-Dorg.gradle.daemon=false -Dorg.gradle.jvmargs="-XX:+HeapDumpOnOutOfMemoryError"'
368-
- ANDROID_NDK: '/opt/ndk/android-ndk-r10e'
368+
- ANDROID_NDK: '/opt/ndk/android-ndk-r17b'
369369
- BUILD_THREADS: 2
370370

371371
macos_defaults: &macos_defaults

‎ContainerShip/Dockerfile.android-base

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ LABEL maintainer="Héctor Ramos <[email protected]>"
2020
ARG SDK_VERSION=sdk-tools-linux-3859397.zip
2121
ARG ANDROID_BUILD_VERSION=26
2222
ARG ANDROID_TOOLS_VERSION=26.0.3
23-
ARG BUCK_VERSION=v2018.06.25.01
24-
ARG NDK_VERSION=10e
23+
ARG BUCK_VERSION=v2018.07.23.01
24+
ARG NDK_VERSION=17b
2525
ARG NODE_VERSION=8.10.0
2626
ARG WATCHMAN_VERSION=4.9.0
2727

‎RNTester/android/app/gradle.properties

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
android.useDeprecatedNdk=true
21
org.gradle.parallel=true
32
org.gradle.configureondemand=true
43
MYAPP_RELEASE_STORE_FILE=my-release-key.keystore

‎ReactAndroid/gradle.properties

-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ POM_NAME=ReactNative
55
POM_ARTIFACT_ID=react-native
66
POM_PACKAGING=aar
77

8-
android.useDeprecatedNdk=true
9-
108
MOCKITO_CORE_VERSION=1.10.19
119
POWERMOCK_VERSION=1.6.2
1210
ROBOLECTRIC_VERSION=3.0

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

+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_CFLAGS := -Wall -Werror
1314
APP_CPPFLAGS := -std=c++1y
1415
APP_LDFLAGS := -Wl,--build-id
1516

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

-6
Original file line numberDiff line numberDiff line change
@@ -24,19 +24,13 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
2424
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include
2525

2626
LOCAL_CFLAGS := -DLOG_TAG=\"libfb\" -DDISABLE_CPUCAP -DDISABLE_XPLAT -fexceptions -frtti
27-
LOCAL_CFLAGS += -Wall -Werror
2827
# include/utils/threads.h has unused parameters
2928
LOCAL_CFLAGS += -Wno-unused-parameter
3029
ifeq ($(TOOLCHAIN_PERMISSIVE),true)
3130
LOCAL_CFLAGS += -Wno-error=unused-but-set-variable
3231
endif
3332
LOCAL_CFLAGS += -DHAVE_POSIX_CLOCKS
3433

35-
CXX11_FLAGS := -std=c++11
36-
LOCAL_CFLAGS += $(CXX11_FLAGS)
37-
38-
LOCAL_EXPORT_CPPFLAGS := $(CXX11_FLAGS)
39-
4034
LOCAL_LDLIBS := -llog -ldl -landroid
4135
LOCAL_EXPORT_LDLIBS := -llog
4236

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

-6
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,6 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)
88
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
99

1010
LOCAL_CFLAGS := -fexceptions -fno-omit-frame-pointer
11-
LOCAL_CFLAGS += -Wall -Werror
12-
13-
CXX11_FLAGS := -std=c++11
14-
LOCAL_CFLAGS += $(CXX11_FLAGS)
15-
16-
LOCAL_EXPORT_CPPFLAGS := $(CXX11_FLAGS)
1711

1812
LOCAL_LDLIBS := -llog
1913

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

+1-4
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,7 @@ LOCAL_SRC_FILES := \
99

1010
LOCAL_C_INCLUDES := $(LOCAL_PATH)/jni
1111

12-
LOCAL_CFLAGS += -Wall -Werror -fvisibility=hidden -fexceptions -frtti -O3
13-
CXX11_FLAGS := -std=c++11
14-
LOCAL_CFLAGS += $(CXX11_FLAGS)
15-
LOCAL_EXPORT_CPPFLAGS := $(CXX11_FLAGS)
12+
LOCAL_CFLAGS += -fvisibility=hidden -fexceptions -frtti -O3
1613

1714
LOCAL_LDLIBS += -landroid -llog
1815
LOCAL_STATIC_LIBRARIES := libyogacore

‎ReactAndroid/src/main/jni/react/jni/Android.mk

+1-4
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,7 @@ LOCAL_SRC_FILES := \
3131
LOCAL_C_INCLUDES := $(LOCAL_PATH)
3232
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../..
3333

34-
LOCAL_CFLAGS += -Wall -Werror -fvisibility=hidden -fexceptions -frtti
35-
CXX11_FLAGS := -std=c++11
36-
LOCAL_CFLAGS += $(CXX11_FLAGS)
37-
LOCAL_EXPORT_CPPFLAGS := $(CXX11_FLAGS)
34+
LOCAL_CFLAGS += -fvisibility=hidden -fexceptions -frtti
3835

3936
LOCAL_LDLIBS += -landroid
4037
LOCAL_SHARED_LIBRARIES := libfolly_json libfb libjsc libglog_init libyoga libprivatedata

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

-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ 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=c++11
7-
LOCAL_EXPORT_CPPFLAGS := $(CXX11_FLAGS)
86

97
LOCAL_MODULE := boost
108

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@ LOCAL_SRC_FILES := \
1616

1717
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
1818

19-
CXX11_FLAGS := -std=c++11 -Wno-unused-variable -Wno-unused-local-typedefs
19+
CXX11_FLAGS := -Wno-unused-variable -Wno-unused-local-typedefs
2020
LOCAL_CFLAGS += $(CXX11_FLAGS)
21-
LOCAL_EXPORT_CPPFLAGS := $(CXX11_FLAGS)
2221

2322
include $(BUILD_STATIC_LIBRARY)

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

+5-9
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,19 @@ LOCAL_SRC_FILES:= \
66
folly/Unicode.cpp \
77
folly/Conv.cpp \
88
folly/Demangle.cpp \
9-
folly/detail/MallocImpl.cpp \
10-
folly/StringBase.cpp \
11-
folly/dynamic.cpp \
9+
folly/detail/MallocImpl.cpp \
10+
folly/StringBase.cpp \
11+
folly/dynamic.cpp \
1212

1313
LOCAL_C_INCLUDES := $(LOCAL_PATH)
1414
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
1515

1616
LOCAL_CFLAGS += -fexceptions -fno-omit-frame-pointer -frtti
17-
LOCAL_CFLAGS += -Wall -Werror -std=c++11
1817

19-
CXX11_FLAGS := -std=c++11
20-
LOCAL_CFLAGS += $(CXX11_FLAGS)
21-
22-
FOLLY_FLAGS := -DFOLLY_NO_CONFIG=1 -DFOLLY_HAVE_CLOCK_GETTIME=1
18+
FOLLY_FLAGS := -DFOLLY_NO_CONFIG=1 -DFOLLY_HAVE_CLOCK_GETTIME=1 -DFOLLY_HAVE_MEMRCHR=1
2319
LOCAL_CFLAGS += $(FOLLY_FLAGS)
2420

25-
LOCAL_EXPORT_CPPFLAGS := $(CXX11_FLAGS) $(FOLLY_FLAGS)
21+
LOCAL_EXPORT_CPPFLAGS := $(FOLLY_FLAGS)
2622

2723
LOCAL_MODULE := libfolly_json
2824

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH) $(LOCAL_PATH)/.. $(LOCAL_PATH)/glog-0.3.5/src/
1616
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/.. $(LOCAL_PATH)/glog-0.3.5/src/
1717

1818
LOCAL_CFLAGS += \
19-
-Wall \
2019
-Wwrite-strings \
2120
-Woverloaded-virtual \
2221
-Wno-sign-compare \
@@ -27,6 +26,6 @@ LOCAL_CFLAGS += \
2726
-D_END_GOOGLE_NAMESPACE_="}"
2827

2928

30-
LOCAL_MODULE := glog
29+
LOCAL_MODULE := glog
3130

3231
include $(BUILD_SHARED_LIBRARY)

‎ReactCommon/cxxreact/Android.mk

+1-4
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,7 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_C_INCLUDES)
3333
LOCAL_CFLAGS := \
3434
-DLOG_TAG=\"ReactNative\"
3535

36-
LOCAL_CFLAGS += -Wall -Werror -fexceptions -frtti
37-
CXX11_FLAGS := -std=c++11
38-
LOCAL_CFLAGS += $(CXX11_FLAGS)
39-
LOCAL_EXPORT_CPPFLAGS := $(CXX11_FLAGS)
36+
LOCAL_CFLAGS += -fexceptions -frtti
4037

4138
LOCAL_STATIC_LIBRARIES := jschelpers
4239
LOCAL_SHARED_LIBRARIES := libfb libfolly_json libjsc libglog

‎ReactCommon/jschelpers/Android.mk

+1-4
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,7 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_C_INCLUDES)
1515
LOCAL_CFLAGS := \
1616
-DLOG_TAG=\"ReactNative\"
1717

18-
LOCAL_CFLAGS += -Wall -Werror -fexceptions -frtti
19-
CXX11_FLAGS := -std=c++11
20-
LOCAL_CFLAGS += $(CXX11_FLAGS)
21-
LOCAL_EXPORT_CPPFLAGS := $(CXX11_FLAGS)
18+
LOCAL_CFLAGS += -fexceptions -frtti
2219

2320
LOCAL_SHARED_LIBRARIES := libfolly_json libjsc libglog
2421

‎ReactCommon/jsinspector/Android.mk

+1-4
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@ LOCAL_SRC_FILES := \
1010
LOCAL_C_INCLUDES := $(LOCAL_PATH)/..
1111
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_C_INCLUDES)
1212

13-
LOCAL_CFLAGS += -Wall -Werror -fexceptions
14-
CXX11_FLAGS := -std=c++11
15-
LOCAL_CFLAGS += $(CXX11_FLAGS)
16-
LOCAL_EXPORT_CPPFLAGS := $(CXX11_FLAGS)
13+
LOCAL_CFLAGS += -fexceptions
1714

1815
include $(BUILD_SHARED_LIBRARY)

‎ReactCommon/privatedata/Android.mk

+1-4
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_C_INCLUDES)
1313
LOCAL_CFLAGS := \
1414
-DLOG_TAG=\"ReactNative\"
1515

16-
LOCAL_CFLAGS += -Wall -Werror -fexceptions -frtti
17-
CXX11_FLAGS := -std=c++11
18-
LOCAL_CFLAGS += $(CXX11_FLAGS)
19-
LOCAL_EXPORT_CPPFLAGS := $(CXX11_FLAGS)
16+
LOCAL_CFLAGS += -fexceptions -frtti
2017

2118
include $(BUILD_SHARED_LIBRARY)

‎ReactCommon/yoga/Android.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/yoga/*.cpp)
99
LOCAL_C_INCLUDES := $(LOCAL_PATH)
1010
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_C_INCLUDES)
1111

12-
LOCAL_CFLAGS := -Wall -Werror -fexceptions -frtti -std=c++1y -O3
12+
LOCAL_CFLAGS := -fexceptions -frtti -O3
1313

1414
include $(BUILD_STATIC_LIBRARY)

‎appveyor.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
environment:
22
ANDROID_HOME: "C:\\android-sdk-windows"
3-
ANDROID_NDK: "C:\\android-sdk-windows\\android-ndk-r10e"
3+
ANDROID_NDK: "C:\\android-sdk-windows\\android-ndk-r17b"
44
ANDROID_BUILD_VERSION: 26
55
ANDROID_TOOLS_VERSION: 26.0.3
66

77
GRADLE_OPTS: -Dorg.gradle.daemon=false
88

99
SDK_TOOLS_URL: https://dl.google.com/android/repository/sdk-tools-windows-3859397.zip
10-
NDK_TOOLS_URL: https://dl.google.com/android/repository/android-ndk-r10e-windows-x86_64.zip
10+
NDK_TOOLS_URL: https://dl.google.com/android/repository/android-ndk-r17b-windows-x86_64.zip
1111

1212
matrix:
1313
- nodejs_version: 8

‎local-cli/templates/HelloWorld/android/gradle.properties

-2
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,3 @@
1616
# This option should only be used with decoupled projects. More details, visit
1717
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
1818
# org.gradle.parallel=true
19-
20-
android.useDeprecatedNdk=true

‎scripts/android-setup.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ function getAndroidNDK {
3434
if [ ! -e $DEPS ]; then
3535
cd $NDK_HOME || exit
3636
echo "Downloading NDK..."
37-
curl -o ndk.zip https://dl.google.com/android/repository/android-ndk-r10e-linux-x86_64.zip
37+
curl -o ndk.zip https://dl.google.com/android/repository/android-ndk-r17b-linux-x86_64.zip
3838
unzip -o -q ndk.zip
3939
echo "Installed Android NDK at $NDK_HOME"
4040
touch $DEPS

0 commit comments

Comments
 (0)