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

Turn thumb back on.

Browse Source 
We expect this might break Android GMs.  If it does I'll rebaseline or revert.

BUG=
R=djsollen@google.com

Review URL: https://codereview.chromium.org/21096004

git-svn-id: http://skia.googlecode.com/svn/trunk@10415 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
mtklein@google.com 2013-07-29 18:33:33 +00:00
parent 4dcd062803
commit b3915b5a9f
1 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
platform_tools/android/bin/android_setup.sh
View File

@ -141,30 +141,16 @@ 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"
;; ;;
@ -190,7 +176,7 @@ setup_device() {
;; ;;
*) *)
echo -n "ERROR: unknown device specified ($TARGET_DEVICE), valid values: " echo -n "ERROR: unknown device specified ($TARGET_DEVICE), valid values: "
echo "nexus_[s,4,7,10] xoom galaxy_nexus arm arm_thumb arm_v7 arm_v7_thumb x86" echo "nexus_[s,4,7,10] xoom galaxy_nexus razr_i arm arm_thumb arm_v7 arm_v7_thumb x86"
return 1; return 1;
;; ;;
esac esac