diff options
| author |  mtklein@google.com <mtklein@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-07-29 18:33:33 +0000 |
|---|---|---|
| committer | mtklein@google.com <mtklein@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-07-29 18:33:33 +0000 |
| commit | b3915b5a9f6a7c4ed9f36921ea82d5b3318654f6 (patch) | |
| tree | 2a65e502a4c415568a88c61e27c637b823774747 /platform_tools | |
| parent | 4dcd062803fef457899add1df56e9defb667ce8d (diff) | |
Turn thumb back on.
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
Diffstat (limited to 'platform_tools')
| -rwxr-xr-x | platform_tools/android/bin/android_setup.sh | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/platform_tools/android/bin/android_setup.sh b/platform_tools/android/bin/android_setup.sh index ca900ad2bb..0d2098f902 100755 --- a/platform_tools/android/bin/android_setup.sh +++ b/platform_tools/android/bin/android_setup.sh @@ -141,30 +141,16 @@ 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" ;; @@ -190,7 +176,7 @@ setup_device() { ;; *) 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; ;; esac |