diff --git a/.appveyor/config.yml b/.appveyor/config.yml index 85b77e9664a251..91806425292db2 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-r18b" 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-r18b-windows-x86_64.zip matrix: - nodejs_version: 8 diff --git a/.circleci/config.yml b/.circleci/config.yml index 2114d2505ebbce..99c0241d1265ec 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -49,11 +49,11 @@ aliases: - &restore-cache-ndk keys: - - v3-android-ndk-r17c-{{ checksum "scripts/android-setup.sh" }} + - v3-android-ndk-r18b-{{ checksum "scripts/android-setup.sh" }} - &save-cache-ndk paths: - /opt/ndk - key: v3-android-ndk-r17c-{{ checksum "scripts/android-setup.sh" }} + key: v3-android-ndk-r18b-{{ checksum "scripts/android-setup.sh" }} - &restore-cache-downloads-buck keys: @@ -347,7 +347,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-r17c' + - ANDROID_NDK: '/opt/ndk/android-ndk-r18b' - BUILD_THREADS: 2 macos_defaults: &macos_defaults diff --git a/ContainerShip/Dockerfile.android-base b/ContainerShip/Dockerfile.android-base index d1a42d64dbc443..e7cf4ef381963d 100644 --- a/ContainerShip/Dockerfile.android-base +++ b/ContainerShip/Dockerfile.android-base @@ -26,7 +26,7 @@ ARG SDK_VERSION=sdk-tools-linux-3859397.zip ARG ANDROID_BUILD_VERSION=28 ARG ANDROID_TOOLS_VERSION=28.0.3 ARG BUCK_VERSION=v2019.01.10.01 -ARG NDK_VERSION=17c +ARG NDK_VERSION=18b 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 c76f520b931854..da8f4c361cfdc9 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-r17c-linux-x86_64.zip + curl -o ndk.zip https://dl.google.com/android/repository/android-ndk-r18b-linux-x86_64.zip unzip -o -q ndk.zip echo "Installed Android NDK at $NDK_HOME" touch $DEPS