| commit | 8a6d23257eb948a897d97c7219520e4e023e0840 | [log] [tgz] |
|---|---|---|
| author | mtklein <mtklein@chromium.org> | Mon Jul 11 08:27:43 2016 -0700 |
| committer | Commit bot <commit-bot@chromium.org> | Mon Jul 11 08:27:43 2016 -0700 |
| tree | edca44f958eb3f2fc5a017e79f24a329acf2239e | |
| parent | 6006f678e78af7b6f67a454cd4bc213048983f9d [diff] |
ndk: r11c -> r12b BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2140603002 Review-Url: https://codereview.chromium.org/2140603002
diff --git a/platform_tools/android/bin/utils/setup_toolchain.sh b/platform_tools/android/bin/utils/setup_toolchain.sh index fac8190..ebeab27 100755 --- a/platform_tools/android/bin/utils/setup_toolchain.sh +++ b/platform_tools/android/bin/utils/setup_toolchain.sh
@@ -35,14 +35,14 @@ 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