AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert of Update the Android NDK to r10c (patchset #1 id:1 of https://codereview.chromium.org/687603002/)

Browse Source 
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
This commit is contained in:
hcm 2014-10-28 08:25:31 -07:00 committed by Commit bot
parent b44293e712
commit 89e5caa6fb
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
platform_tools/android/bin/utils/setup_toolchain.sh
View File

@ -27,11 +27,11 @@ if [ -z "$SCRIPT_DIR" ]; then
fi fi
function default_toolchain() { function default_toolchain() {
NDK_REV=${NDK_REV-10c} NDK_REV=${NDK_REV-10exp}
ANDROID_ARCH=${ANDROID_ARCH-arm} ANDROID_ARCH=${ANDROID_ARCH-arm}
if [[ $ANDROID_ARCH == *64* ]]; then 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 else
API_LEVEL=14 # Official Android 4.0 system images API_LEVEL=14 # Official Android 4.0 system images
fi fi