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
This commit is contained in:
djsollen@google.com 2013-07-12 13:31:51 +00:00
parent 585f89a8fe
commit cfe3c11c76

View File

@ -141,16 +141,30 @@ setup_device() {
case $TARGET_DEVICE in case $TARGET_DEVICE in
nexus_s) 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_arch_type=arm arm_neon=1 armv7=1 arm_thumb=1"
DEFINES="${DEFINES} skia_texture_cache_mb_limit=24" DEFINES="${DEFINES} skia_texture_cache_mb_limit=24"
;; ;;
nexus_4 | nexus_7 | nexus_10) 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" DEFINES="${DEFINES} skia_arch_type=arm arm_neon=1 armv7=1 arm_thumb=1"
;; ;;
xoom) 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" DEFINES="${DEFINES} skia_arch_type=arm arm_neon=0 armv7=1 arm_thumb=1"
;; ;;
galaxy_nexus) 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_arch_type=arm arm_neon=1 armv7=1 arm_thumb=1"
DEFINES="${DEFINES} skia_texture_cache_mb_limit=32" DEFINES="${DEFINES} skia_texture_cache_mb_limit=32"
;; ;;