aboutsummaryrefslogtreecommitdiffhomepage
path: root/platform_tools/android/bin
diff options
context:
space:
mode:
authorGravatar djsollen <djsollen@google.com>2014-10-28 06:53:08 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2014-10-28 06:53:09 -0700
commita01a17b3f2f225d9499627e20f9b42ce351bd0eb (patch)
tree9496905d3f4d1fd2c2903dd18591e35f6dfb228b /platform_tools/android/bin
parenteb06588dfc56c9165ebda7d73f23758dbb7de573 (diff)
Update the Android NDK to r10c
Diffstat (limited to 'platform_tools/android/bin')
-rwxr-xr-xplatform_tools/android/bin/utils/setup_toolchain.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/platform_tools/android/bin/utils/setup_toolchain.sh b/platform_tools/android/bin/utils/setup_toolchain.sh
index ef491506fc..1866971248 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