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

Default to arm_v7_neon.

Browse Source 
This aliases all devices we know have NEON over to that too.

BUG=skia:

Review URL: https://codereview.chromium.org/1095953007
This commit is contained in:
mtklein 2015-04-21 14:25:34 -07:00 committed by Commit bot
parent 2575f317d3
commit 5ae0e2b563
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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"
;;