aboutsummaryrefslogtreecommitdiffhomepage
path: root/platform_tools
diff options
context:
space:
mode:
authorGravatar mtklein <mtklein@chromium.org>2016-05-05 10:58:39 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2016-05-05 10:58:39 -0700
commit809ccf37ec836d0df64afd0b13023fd968d505a4 (patch)
tree38972cc13cfc15013e18ef28075a5650aa0d893d /platform_tools
parent42846ed43767740993f6eb1cdb62f208713304c9 (diff)
Remove NEON runtime detection support.
BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1952953004 CQ_EXTRA_TRYBOTS=client.skia:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD-Trybot Review-Url: https://codereview.chromium.org/1952953004
Diffstat (limited to 'platform_tools')
-rwxr-xr-xplatform_tools/android/bin/android_setup.sh6
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 f242bfa51b..0a6fd5f0ab 100755
--- a/platform_tools/android/bin/android_setup.sh
+++ b/platform_tools/android/bin/android_setup.sh
@@ -35,13 +35,13 @@ while (( "$#" )); do
elif [[ "$1" == "--gcc" ]]; then
USE_CLANG="false"
elif [[ "$1" == "--clang" ]]; then
- USE_CLANG="true"
+ USE_CLANG="true"
elif [[ "$1" == "--logcat" ]]; then
LOGCAT=1
elif [[ "$1" == "--verbose" ]]; then
VERBOSE="true"
elif [[ "$1" == "--vulkan" ]]; then
- SKIA_VULKAN="true"
+ SKIA_VULKAN="true"
else
APP_ARGS=("${APP_ARGS[@]}" "${1}")
fi
@@ -126,7 +126,7 @@ setup_device() {
ANDROID_ARCH="arm"
;;
arm_v7 | xoom)
- DEFINES="${DEFINES} skia_arch_type=arm arm_neon_optional=1 arm_version=7"
+ DEFINES="${DEFINES} skia_arch_type=arm arm_neon=0 arm_version=7"
ANDROID_ARCH="arm"
;;
arm_v7_neon | nexus_4 | nexus_5 | nexus_6 | nexus_7 | nexus_10)