platform_tools/android/bin/utils/setup_toolchain.sh - Issue 2140603002: ndk: r11c -> r12b

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: platform_tools/android/bin/utils/setup_toolchain.sh

Issue 2140603002: ndk: r11c -> r12b (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: Created 4 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: platform_tools/android/bin/utils/setup_toolchain.sh

diff --git a/platform_tools/android/bin/utils/setup_toolchain.sh b/platform_tools/android/bin/utils/setup_toolchain.sh

index fac8190a963890a0a7ec5cb7254acd85d1a4c3df..ebeab27a5031bcf0d89694134fc8d287d9dbd9fa 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

if [ "$SKIA_VULKAN" == "true" ]; then

API=24 # Android N Preview

« no previous file with comments | « no previous file | no next file » | no next file with comments »