From 15a1c180d257797332d6cedcedf355464b399426 Mon Sep 17 00:00:00 2001
From: Dulmandakh <dulmandakh@gmail.com>
Date: Wed, 10 Oct 2018 12:02:06 +0800
Subject: [PATCH 1/2] bump android ndk to r17c

---
 .circleci/config.yml     | 6 +++---
 appveyor.yml             | 4 ++--
 scripts/android-setup.sh | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 682a6732414fe8..9ab04fa45a7ff3 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -49,11 +49,11 @@ aliases:
 
   - &restore-cache-ndk
     keys:
-      - v3-android-ndk-r17b-{{ checksum "scripts/android-setup.sh" }}
+      - v3-android-ndk-r17c-{{ checksum "scripts/android-setup.sh" }}
   - &save-cache-ndk
     paths:
       - /opt/ndk
-    key: v3-android-ndk-r17b-{{ checksum "scripts/android-setup.sh" }}
+    key: v3-android-ndk-r17c-{{ checksum "scripts/android-setup.sh" }}
 
   - &restore-cache-downloads-buck
     keys:
@@ -344,7 +344,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-r17b'
+    - ANDROID_NDK: '/opt/ndk/android-ndk-r17c'
     - BUILD_THREADS: 2
 
 macos_defaults: &macos_defaults
diff --git a/appveyor.yml b/appveyor.yml
index 61fe51b3069ac6..c41066d86eca60 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,13 +1,13 @@
 environment:
     ANDROID_HOME: "C:\\android-sdk-windows"
-    ANDROID_NDK: "C:\\android-sdk-windows\\android-ndk-r17b"
+    ANDROID_NDK: "C:\\android-sdk-windows\\android-ndk-r17c"
     ANDROID_BUILD_VERSION: 27
     ANDROID_TOOLS_VERSION: 27.0.3
 
     GRADLE_OPTS: -Dorg.gradle.daemon=false
 
     SDK_TOOLS_URL: https://dl.google.com/android/repository/sdk-tools-windows-3859397.zip
-    NDK_TOOLS_URL: https://dl.google.com/android/repository/android-ndk-r17b-windows-x86_64.zip
+    NDK_TOOLS_URL: https://dl.google.com/android/repository/android-ndk-r17c-windows-x86_64.zip
 
     matrix:
         - nodejs_version: 8
diff --git a/scripts/android-setup.sh b/scripts/android-setup.sh
index 957875054372cf..c76f520b931854 100644
--- a/scripts/android-setup.sh
+++ b/scripts/android-setup.sh
@@ -40,7 +40,7 @@ function getAndroidNDK {
   if [ ! -e $DEPS ]; then
     cd $NDK_HOME || exit
     echo "Downloading NDK..."
-    curl -o ndk.zip https://dl.google.com/android/repository/android-ndk-r17b-linux-x86_64.zip
+    curl -o ndk.zip https://dl.google.com/android/repository/android-ndk-r17c-linux-x86_64.zip
     unzip -o -q ndk.zip
     echo "Installed Android NDK at $NDK_HOME"
     touch $DEPS

From 060f4114ed34faec71f1033f535afc74a88ca9b2 Mon Sep 17 00:00:00 2001
From: Dulmandakh <dulmandakh@gmail.com>
Date: Thu, 11 Oct 2018 10:12:51 +0800
Subject: [PATCH 2/2] 17c in Dockerfile.android-base

---
 ContainerShip/Dockerfile.android-base | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ContainerShip/Dockerfile.android-base b/ContainerShip/Dockerfile.android-base
index 6cbc6438c75bdf..433adf5470e122 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=27
 ARG ANDROID_TOOLS_VERSION=27.0.3
 ARG BUCK_VERSION=v2018.07.23.01
-ARG NDK_VERSION=17b
+ARG NDK_VERSION=17c
 ARG NODE_VERSION=8.10.0
 ARG WATCHMAN_VERSION=4.9.0