diff options
| author |  djsollen <djsollen@google.com> | 2014-10-30 13:27:26 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-10-30 13:27:26 -0700 |
| commit | e228ba3e5cab59034875ea6599527aab30f04623 (patch) | |
| tree | 9139fa4b42d604bf1b31c613217ade2f25772e1f /platform_tools/android | |
| parent | 2000c3de5b81bbbd19217868a443f06386470c3c (diff) | |
Update the Android NDK to r10c
Review URL: https://codereview.chromium.org/689943002
Diffstat (limited to 'platform_tools/android')
| -rwxr-xr-x | platform_tools/android/bin/utils/setup_toolchain.sh | 6 |
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 |