Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(146)

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

Issue 689943002: Update the Android NDK to r10c (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years, 2 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 ef491506fcf6395cfa9cf41639a81c818e412384..1866971248a39451d036cb193bd312fa4f091b55 100755
--- a/platform_tools/android/bin/utils/setup_toolchain.sh
+++ b/platform_tools/android/bin/utils/setup_toolchain.sh
@@ -27,13 +27,13 @@ if [ -z "$SCRIPT_DIR" ]; then
fi
function default_toolchain() {
- NDK_REV=${NDK_REV-10exp}
+ NDK_REV=${NDK_REV-10c}
ANDROID_ARCH=${ANDROID_ARCH-arm}
if [[ $ANDROID_ARCH == *64* ]]; then
- API_LEVEL=L # Experimental Android L-Release system images
+ API_LEVEL=21 # Official Android 5.0 (Lollipop) system images
else
- API_LEVEL=14 # Official Android 4.0 system images
+ API_LEVEL=14 # Official Android 4.0 system images
fi
TOOLCHAIN_DIR=${SCRIPT_DIR}/../toolchains
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698