diff options
| author | Jeffrey Walton <noloader@gmail.com> | 2017-09-13 05:22:19 -0400 |
|---|---|---|
| committer | Jeffrey Walton <noloader@gmail.com> | 2017-09-13 05:22:19 -0400 |
| commit | fcee76594c3dcb74da0cc3dbfed4ed62ce4fd9b4 (patch) | |
| tree | eff0f54c09cff878ff596274f305a658af78205f | |
| parent | b255bf26ec404d23ae572139df15c76a21a0226c (diff) | |
| download | cryptopp-git-fcee76594c3dcb74da0cc3dbfed4ed62ce4fd9b4.tar.gz | |
Make armv7a-neon the default in 2017 with NDK R15
| -rwxr-xr-x | TestScripts/setenv-android.sh | 4 | ||||
| -rwxr-xr-x | 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" |