Skip to content

Commit 436cf15

Browse files
dulmandakhfacebook-github-bot
authored andcommitted
bump Android NDK to r17c (#21628)
Summary: bump Android NDK to r17c, which is only available revision to download for r17. And it includes bug fixes. Pull Request resolved: #21628 Differential Revision: D10352162 Pulled By: hramos fbshipit-source-id: d372e55443260242a44a1f73698977a3e361f001
1 parent d8a5da5 commit 436cf15

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

.circleci/config.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,11 @@ aliases:
4949

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

5858
- &restore-cache-downloads-buck
5959
keys:
@@ -344,7 +344,7 @@ android_defaults: &android_defaults
344344
- ADB_INSTALL_TIMEOUT: 10
345345
- _JAVA_OPTIONS: "-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap"
346346
- GRADLE_OPTS: '-Dorg.gradle.daemon=false -Dorg.gradle.jvmargs="-XX:+HeapDumpOnOutOfMemoryError"'
347-
- ANDROID_NDK: '/opt/ndk/android-ndk-r17b'
347+
- ANDROID_NDK: '/opt/ndk/android-ndk-r17c'
348348
- BUILD_THREADS: 2
349349

350350
macos_defaults: &macos_defaults

ContainerShip/Dockerfile.android-base

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ ARG SDK_VERSION=sdk-tools-linux-3859397.zip
2121
ARG ANDROID_BUILD_VERSION=27
2222
ARG ANDROID_TOOLS_VERSION=27.0.3
2323
ARG BUCK_VERSION=v2018.07.23.01
24-
ARG NDK_VERSION=17b
24+
ARG NDK_VERSION=17c
2525
ARG NODE_VERSION=8.10.0
2626
ARG WATCHMAN_VERSION=4.9.0
2727

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-r17b"
3+
ANDROID_NDK: "C:\\android-sdk-windows\\android-ndk-r17c"
44
ANDROID_BUILD_VERSION: 27
55
ANDROID_TOOLS_VERSION: 27.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-r17b-windows-x86_64.zip
10+
NDK_TOOLS_URL: https://dl.google.com/android/repository/android-ndk-r17c-windows-x86_64.zip
1111

1212
matrix:
1313
- nodejs_version: 8

scripts/android-setup.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ function getAndroidNDK {
4040
if [ ! -e $DEPS ]; then
4141
cd $NDK_HOME || exit
4242
echo "Downloading NDK..."
43-
curl -o ndk.zip https://dl.google.com/android/repository/android-ndk-r17b-linux-x86_64.zip
43+
curl -o ndk.zip https://dl.google.com/android/repository/android-ndk-r17c-linux-x86_64.zip
4444
unzip -o -q ndk.zip
4545
echo "Installed Android NDK at $NDK_HOME"
4646
touch $DEPS

0 commit comments

Comments
 (0)