From fcee76594c3dcb74da0cc3dbfed4ed62ce4fd9b4 Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Wed, 13 Sep 2017 05:22:19 -0400 Subject: [PATCH] Make armv7a-neon the default in 2017 with NDK R15 --- TestScripts/setenv-android.sh | 4 ++-- setenv-android.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/TestScripts/setenv-android.sh b/TestScripts/setenv-android.sh index 2e572d42..b93ce796 100755 --- a/TestScripts/setenv-android.sh +++ b/TestScripts/setenv-android.sh @@ -93,7 +93,7 @@ fi ##################################################################### if [ "$#" -lt 1 ]; then - THE_ARCH=armv7 + THE_ARCH=armv7a-neon else THE_ARCH=$(tr [A-Z] [a-z] <<< "$1") fi @@ -107,7 +107,7 @@ case "$THE_ARCH" in AOSP_ARCH="arch-arm" AOSP_FLAGS="-march=armv5te -mtune=xscale -mthumb -msoft-float -funwind-tables -fexceptions -frtti" ;; - armv7a|armeabi-v7a) + armv7a|armv7-a|armeabi-v7a) TOOLCHAIN_ARCH="arm-linux-androideabi" TOOLCHAIN_NAME="arm-linux-androideabi" AOSP_ABI="armeabi-v7a" diff --git a/setenv-android.sh b/setenv-android.sh index 2e572d42..b93ce796 100755 --- a/setenv-android.sh +++ b/setenv-android.sh @@ -93,7 +93,7 @@ fi ##################################################################### if [ "$#" -lt 1 ]; then - THE_ARCH=armv7 + THE_ARCH=armv7a-neon else THE_ARCH=$(tr [A-Z] [a-z] <<< "$1") fi @@ -107,7 +107,7 @@ case "$THE_ARCH" in AOSP_ARCH="arch-arm" AOSP_FLAGS="-march=armv5te -mtune=xscale -mthumb -msoft-float -funwind-tables -fexceptions -frtti" ;; - armv7a|armeabi-v7a) + armv7a|armv7-a|armeabi-v7a) TOOLCHAIN_ARCH="arm-linux-androideabi" TOOLCHAIN_NAME="arm-linux-androideabi" AOSP_ABI="armeabi-v7a"