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: https://github.com/facebook/react-native/pull/21628 Differential Revision: D10352162 Pulled By: hramos fbshipit-source-id: d372e55443260242a44a1f73698977a3e361f001
This commit is contained in:
Родитель
d8a5da5153
Коммит
436cf154bb
|
@ -49,11 +49,11 @@ aliases:
|
||||||
|
|
||||||
- &restore-cache-ndk
|
- &restore-cache-ndk
|
||||||
keys:
|
keys:
|
||||||
- v3-android-ndk-r17b-{{ checksum "scripts/android-setup.sh" }}
|
- v3-android-ndk-r17c-{{ checksum "scripts/android-setup.sh" }}
|
||||||
- &save-cache-ndk
|
- &save-cache-ndk
|
||||||
paths:
|
paths:
|
||||||
- /opt/ndk
|
- /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
|
- &restore-cache-downloads-buck
|
||||||
keys:
|
keys:
|
||||||
|
@ -344,7 +344,7 @@ android_defaults: &android_defaults
|
||||||
- ADB_INSTALL_TIMEOUT: 10
|
- ADB_INSTALL_TIMEOUT: 10
|
||||||
- _JAVA_OPTIONS: "-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap"
|
- _JAVA_OPTIONS: "-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap"
|
||||||
- GRADLE_OPTS: '-Dorg.gradle.daemon=false -Dorg.gradle.jvmargs="-XX:+HeapDumpOnOutOfMemoryError"'
|
- 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
|
- BUILD_THREADS: 2
|
||||||
|
|
||||||
macos_defaults: &macos_defaults
|
macos_defaults: &macos_defaults
|
||||||
|
|
|
@ -21,7 +21,7 @@ ARG SDK_VERSION=sdk-tools-linux-3859397.zip
|
||||||
ARG ANDROID_BUILD_VERSION=27
|
ARG ANDROID_BUILD_VERSION=27
|
||||||
ARG ANDROID_TOOLS_VERSION=27.0.3
|
ARG ANDROID_TOOLS_VERSION=27.0.3
|
||||||
ARG BUCK_VERSION=v2018.07.23.01
|
ARG BUCK_VERSION=v2018.07.23.01
|
||||||
ARG NDK_VERSION=17b
|
ARG NDK_VERSION=17c
|
||||||
ARG NODE_VERSION=8.10.0
|
ARG NODE_VERSION=8.10.0
|
||||||
ARG WATCHMAN_VERSION=4.9.0
|
ARG WATCHMAN_VERSION=4.9.0
|
||||||
|
|
||||||
|
|
|
@ -1,13 +1,13 @@
|
||||||
environment:
|
environment:
|
||||||
ANDROID_HOME: "C:\\android-sdk-windows"
|
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_BUILD_VERSION: 27
|
||||||
ANDROID_TOOLS_VERSION: 27.0.3
|
ANDROID_TOOLS_VERSION: 27.0.3
|
||||||
|
|
||||||
GRADLE_OPTS: -Dorg.gradle.daemon=false
|
GRADLE_OPTS: -Dorg.gradle.daemon=false
|
||||||
|
|
||||||
SDK_TOOLS_URL: https://dl.google.com/android/repository/sdk-tools-windows-3859397.zip
|
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:
|
matrix:
|
||||||
- nodejs_version: 8
|
- nodejs_version: 8
|
||||||
|
|
|
@ -40,7 +40,7 @@ function getAndroidNDK {
|
||||||
if [ ! -e $DEPS ]; then
|
if [ ! -e $DEPS ]; then
|
||||||
cd $NDK_HOME || exit
|
cd $NDK_HOME || exit
|
||||||
echo "Downloading NDK..."
|
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
|
unzip -o -q ndk.zip
|
||||||
echo "Installed Android NDK at $NDK_HOME"
|
echo "Installed Android NDK at $NDK_HOME"
|
||||||
touch $DEPS
|
touch $DEPS
|
||||||
|
|
Загрузка…
Ссылка в новой задаче