Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] bump NDK to 18b #22878

Closed
wants to merge 3 commits into from
Closed

[WIP] bump NDK to 18b #22878

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
67fc1a1
bump NDK to 18b
dulmandakh Jan 5, 2019
e14d540
merge master
dulmandakh Jan 12, 2019
627a89d
Merge branch 'master' into ndk-18b
dulmandakh Jan 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .appveyor/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 3 additions & 3 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ContainerShip/Dockerfile.android-base
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion scripts/android-setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down