From 8a6d23257eb948a897d97c7219520e4e023e0840 Mon Sep 17 00:00:00 2001
From: mtklein <mtklein@chromium.org>
Date: Mon, 11 Jul 2016 08:27:43 -0700
Subject: ndk: r11c -> r12b

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2140603002

Review-Url: https://codereview.chromium.org/2140603002
---
 platform_tools/android/bin/utils/setup_toolchain.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'platform_tools/android/bin')

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
-- 
cgit v1.2.3