From cfe3c11c762851e8a45ce17de545490c54804e18 Mon Sep 17 00:00:00 2001 From: "djsollen@google.com" Date: Fri, 12 Jul 2013 13:31:51 +0000 Subject: [PATCH] Revert "switch all the arm7 devices to build with thumb for a while" This reverts r10028 which has altered the GM expectations. R=caryclark@google.com Review URL: https://codereview.chromium.org/18762006 git-svn-id: http://skia.googlecode.com/svn/trunk@10043 2bbb7eff-a529-9590-31e7-b0007b416f81 --- platform_tools/android/bin/android_setup.sh | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/platform_tools/android/bin/android_setup.sh b/platform_tools/android/bin/android_setup.sh index c3e217512c..ca900ad2bb 100755 --- a/platform_tools/android/bin/android_setup.sh +++ b/platform_tools/android/bin/android_setup.sh @@ -141,16 +141,30 @@ setup_device() { case $TARGET_DEVICE in nexus_s) + DEFINES="${DEFINES} skia_arch_type=arm arm_neon=1 armv7=1 arm_thumb=0" + DEFINES="${DEFINES} skia_texture_cache_mb_limit=24" + ;; + nexus_s_thumb) DEFINES="${DEFINES} skia_arch_type=arm arm_neon=1 armv7=1 arm_thumb=1" DEFINES="${DEFINES} skia_texture_cache_mb_limit=24" ;; nexus_4 | nexus_7 | nexus_10) + DEFINES="${DEFINES} skia_arch_type=arm arm_neon=1 armv7=1 arm_thumb=0" + ;; + nexus_4_thumb | nexus_7_thumb | nexus_10_thumb) DEFINES="${DEFINES} skia_arch_type=arm arm_neon=1 armv7=1 arm_thumb=1" ;; xoom) + DEFINES="${DEFINES} skia_arch_type=arm arm_neon=0 armv7=1 arm_thumb=0" + ;; + xoom_thumb) DEFINES="${DEFINES} skia_arch_type=arm arm_neon=0 armv7=1 arm_thumb=1" ;; galaxy_nexus) + DEFINES="${DEFINES} skia_arch_type=arm arm_neon=1 armv7=1 arm_thumb=0" + DEFINES="${DEFINES} skia_texture_cache_mb_limit=32" + ;; + galaxy_nexus_thumb) DEFINES="${DEFINES} skia_arch_type=arm arm_neon=1 armv7=1 arm_thumb=1" DEFINES="${DEFINES} skia_texture_cache_mb_limit=32" ;;