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

Unified Diff: platform_tools/android/bin/android_setup.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
Index: platform_tools/android/bin/android_setup.sh
diff --git a/platform_tools/android/bin/android_setup.sh b/platform_tools/android/bin/android_setup.sh
index 4a7326bf86fff1dcc6e627d903ce981b17109863..b8b1293212141a8e297c30d8b2a8b578fcd0e812 100755
--- a/platform_tools/android/bin/android_setup.sh
+++ b/platform_tools/android/bin/android_setup.sh
@@ -116,6 +116,11 @@ setup_device() {
DEFINES="${DEFINES} skia_resource_cache_mb_limit=32"
ANDROID_ARCH="x86"
;;
+ x86_64 | x64)
+ DEFINES="${DEFINES} skia_arch_type=x86 skia_arch_width=64"
+ DEFINES="${DEFINES} skia_resource_cache_mb_limit=32"
mtklein 2014/07/08 20:16:53 No need to cap any of these before trying the defa
djsollen 2014/07/08 20:39:05 Done.
+ ANDROID_ARCH="x86_64"
+ ;;
arm_v7)
DEFINES="${DEFINES} skia_arch_type=arm arm_neon_optional=1 arm_version=7 arm_thumb=0"
ANDROID_ARCH="arm"
@@ -132,11 +137,21 @@ setup_device() {
DEFINES="${DEFINES} skia_arch_type=arm arm_neon=0 arm_thumb=1"
ANDROID_ARCH="arm"
;;
+ arm64)
+ DEFINES="${DEFINES} skia_arch_type=arm64 skia_arch_width=64"
borenet 2014/07/08 20:04:12 Any reason not to do: "skia_arch_type=arm skia_arc
djsollen 2014/07/08 20:14:46 we can, but we already have gyp conditions that us
+ DEFINES="${DEFINES} skia_resource_cache_mb_limit=32"
+ ANDROID_ARCH="arm64"
+ ;;
mips)
DEFINES="${DEFINES} skia_arch_type=mips skia_arch_width=32"
DEFINES="${DEFINES} skia_resource_cache_mb_limit=32"
ANDROID_ARCH="mips"
;;
+ mips64)
+ DEFINES="${DEFINES} skia_arch_type=mips skia_arch_width=64"
+ DEFINES="${DEFINES} skia_resource_cache_mb_limit=32"
+ ANDROID_ARCH="mips64"
+ ;;
*)
if [ -z "$ANDROID_IGNORE_UNKNOWN_DEVICE" ]; then
echo "ERROR: unknown device $TARGET_DEVICE"

Powered by Google App Engine
This is Rietveld 408576698