platform_tools/android/bin/utils/setup_toolchain.sh - Issue 377993002: update our build system to support the experimental L-Release NDK

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 377993002: update our build system to support the experimental L-Release NDK (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: fixes Created 6 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:

View side-by-side diff with in-line comments

Download patch

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 1e9061698aa5db6f8e6318e399bade4c5eff950c..4476bb8a3858178f49e9f69e53763ccf80682b73 100755

--- a/platform_tools/android/bin/utils/setup_toolchain.sh

+++ b/platform_tools/android/bin/utils/setup_toolchain.sh

@@ -27,9 +27,14 @@ if [ -z "$SCRIPT_DIR" ]; then

function default_toolchain() {

- API_LEVEL=14

- NDK_REV=${NDK_REV-8e}

+ NDK_REV=${NDK_REV-10exp}

ANDROID_ARCH=${ANDROID_ARCH-arm}

+ if [[ $ANDROID_ARCH == *64* ]]; then

+ API_LEVEL=L # Experimental Android L-Release system images

+ else

+ API_LEVEL=14 # Official Android 4.0 system images

+ fi

TOOLCHAIN_DIR=${SCRIPT_DIR}/../toolchains

if [ $(uname) == "Darwin" ]; then

« no previous file with comments | « platform_tools/android/bin/android_setup.sh ('k') | platform_tools/android/gyp/skia_android.gypi » ('j') | no next file with comments »