aboutsummaryrefslogtreecommitdiffhomepage
path: root/platform_tools/android/bin
diff options
context:
space:
mode:
authorGravatar mtklein <mtklein@chromium.org>2016-07-11 08:27:43 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2016-07-11 08:27:43 -0700
commit8a6d23257eb948a897d97c7219520e4e023e0840 (patch)
treeedca44f958eb3f2fc5a017e79f24a329acf2239e /platform_tools/android/bin
parent6006f678e78af7b6f67a454cd4bc213048983f9d (diff)
ndk: r11c -> r12b
Diffstat (limited to 'platform_tools/android/bin')
-rwxr-xr-xplatform_tools/android/bin/utils/setup_toolchain.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/platform_tools/android/bin/utils/setup_toolchain.sh b/platform_tools/android/bin/utils/setup_toolchain.sh
index fac8190a96..ebeab27a50 100755
--- a/platform_tools/android/bin/utils/setup_toolchain.sh
+++ b/platform_tools/android/bin/utils/setup_toolchain.sh
@@ -35,14 +35,14 @@ function default_toolchain() {
TOOLCHAINS=${SCRIPT_DIR}/../toolchains
ANDROID_ARCH=${ANDROID_ARCH-arm}
- NDK=r11c
+ NDK=r12b
if [[ $ANDROID_ARCH == *64* ]]; then
API=21 # Android 5.0
else
API=14 # Android 4.0
fi
-
+
if [ "$SKIA_VULKAN" == "true" ]; then
API=24 # Android N Preview
fi