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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 377993002: update our build system to support the experimental L-Release NDK (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years, 5 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
« platform_tools/android/bin/android_setup.sh ('K') | « platform_tools/android/bin/android_setup.sh ('k') | platform_tools/android/gyp/skia_android.gypi » ('j') | 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 1e9061698aa5db6f8e6318e399bade4c5eff950c..4476bb8a3858178f49e9f69e53763ccf80682b73 100755
--- a/platform_tools/android/bin/utils/setup_toolchain.sh
+++ b/platform_tools/android/bin/utils/setup_toolchain.sh
@@ -27,9 +27,14 @@ if [ -z "$SCRIPT_DIR" ]; then
fi
function default_toolchain() {
- API_LEVEL=14
- NDK_REV=${NDK_REV-8e}
+ NDK_REV=${NDK_REV-10exp}
ANDROID_ARCH=${ANDROID_ARCH-arm}
+
+ if [[ $ANDROID_ARCH == *64* ]]; then
+ API_LEVEL=L # Experimental Android L-Release system images
qiankun 2014/07/10 05:24:15 I tried this NDK. Got error when running bench: ER
+ else
+ API_LEVEL=14 # Official Android 4.0 system images
+ fi
TOOLCHAIN_DIR=${SCRIPT_DIR}/../toolchains
if [ $(uname) == "Darwin" ]; then
« platform_tools/android/bin/android_setup.sh ('K') | « platform_tools/android/bin/android_setup.sh ('k') | platform_tools/android/gyp/skia_android.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698