aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar hcm <hcm@google.com>2014-10-28 08:25:31 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2014-10-28 08:25:31 -0700
commit89e5caa6fb3a9b27ad760bfd93192ff4acb016ff (patch)
tree6c1f51a5393773f9e6cd562b414003a05a6b2c32
parentb44293e712ca22815fcab3fdec8ec21c661781cf (diff)
Revert of Update the Android NDK to r10c (patchset #1 id:1 of https://codereview.chromium.org/687603002/)
Reason for revert: Spooky behavior on Nexus GPUs Original issue's description: > Update the Android NDK to r10c > > Committed: https://skia.googlesource.com/skia/+/a01a17b3f2f225d9499627e20f9b42ce351bd0eb TBR=tomhudson@chromium.org,borenet@google.com,tomhudson@google.com,djsollen@google.com NOTREECHECKS=true NOTRY=true Review URL: https://codereview.chromium.org/685753003
-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 1866971248..ef491506fc 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-10c}
+ NDK_REV=${NDK_REV-10exp}
ANDROID_ARCH=${ANDROID_ARCH-arm}
if [[ $ANDROID_ARCH == *64* ]]; then
- API_LEVEL=21 # Official Android 5.0 (Lollipop) system images
+ API_LEVEL=L # Experimental Android L-Release 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