From 146d1f7578c3fcb4f4a4c49599a78ee437cf41d2 Mon Sep 17 00:00:00 2001 From: Dulmandakh Date: Tue, 4 Jun 2019 13:55:02 -0700 Subject: [PATCH] Bump Android NDK to r19c (#25140) Summary: In 2019-6-4 version of Docker Android image, we've added Android NDK r19c. So this PR will change CI to use NDK r19c. I'll create a PR to website once this merged. Note: I tried to build RN with NDK 19 while I was setting up my laptop after format, and it worked. ## Changelog [Android] [Changed] - Bump Android NDK to r19c Pull Request resolved: https://github.com/facebook/react-native/pull/25140 Differential Revision: D15631301 Pulled By: cpojer fbshipit-source-id: b9a5600df1dadeba328932b694493960b242c2f7 --- .appveyor/config.yml | 4 ++-- .circleci/config.yml | 2 +- scripts/android-setup.sh | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.appveyor/config.yml b/.appveyor/config.yml index a30baf7582a..ed8162cf135 100644 --- a/.appveyor/config.yml +++ b/.appveyor/config.yml @@ -1,13 +1,13 @@ environment: ANDROID_HOME: "C:\\android-sdk-windows" - ANDROID_NDK: "C:\\android-sdk-windows\\android-ndk-r17c" + ANDROID_NDK: "C:\\android-sdk-windows\\android-ndk-r19c" ANDROID_BUILD_VERSION: 28 ANDROID_TOOLS_VERSION: 28.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-r17c-windows-x86_64.zip + NDK_TOOLS_URL: https://dl.google.com/android/repository/android-ndk-r19c-windows-x86_64.zip matrix: - nodejs_version: 8 diff --git a/.circleci/config.yml b/.circleci/config.yml index 439abd9e050..88bb91c0a3c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -23,7 +23,7 @@ executors: reactnativeandroid: <<: *defaults docker: - - image: reactnativecommunity/react-native-android:2019-5-29 + - image: reactnativecommunity/react-native-android:2019-6-4 resource_class: "large" environment: - TERM: "dumb" diff --git a/scripts/android-setup.sh b/scripts/android-setup.sh index c76f520b931..3032d0c69f2 100755 --- 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-r17c-linux-x86_64.zip + curl -o ndk.zip https://dl.google.com/android/repository/android-ndk-r19c-linux-x86_64.zip unzip -o -q ndk.zip echo "Installed Android NDK at $NDK_HOME" touch $DEPS