diff options
| author |  mtklein <mtklein@chromium.org> | 2015-04-21 14:25:34 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-04-21 14:25:34 -0700 |
| commit | 5ae0e2b56373b67a0fe6a0f9d7a0373712d1fa63 (patch) | |
| tree | ee8742877489f1c3d7c29ddfa3b3d019b0e44251 /platform_tools | |
| parent | 2575f317d3fa977676279097332955c20ad46044 (diff) | |
Default to arm_v7_neon.
This aliases all devices we know have NEON over to that too.
BUG=skia:
Review URL: https://codereview.chromium.org/1095953007
Diffstat (limited to 'platform_tools')
| -rwxr-xr-x | platform_tools/android/bin/android_setup.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/platform_tools/android/bin/android_setup.sh b/platform_tools/android/bin/android_setup.sh index e452d746a3..b94d230fb5 100755 --- a/platform_tools/android/bin/android_setup.sh +++ b/platform_tools/android/bin/android_setup.sh @@ -97,7 +97,7 @@ setup_device() { TARGET_DEVICE=$(cat .android_config) verbose "no target device (-d), using ${TARGET_DEVICE} from most recent build" else - TARGET_DEVICE="arm_v7" + TARGET_DEVICE="arm_v7_neon" verbose "no target device (-d), using ${TARGET_DEVICE}" fi fi @@ -107,11 +107,11 @@ setup_device() { DEFINES="${DEFINES} skia_arch_type=arm arm_neon=0" ANDROID_ARCH="arm" ;; - arm_v7 | nexus_4 | nexus_5 | nexus_6 | nexus_7 | nexus_10 | xoom) + arm_v7 | xoom) DEFINES="${DEFINES} skia_arch_type=arm arm_neon_optional=1 arm_version=7" ANDROID_ARCH="arm" ;; - arm_v7_neon) + arm_v7_neon | nexus_4 | nexus_5 | nexus_6 | nexus_7 | nexus_10) DEFINES="${DEFINES} skia_arch_type=arm arm_neon=1 arm_version=7" ANDROID_ARCH="arm" ;; |