arne
/
cryptopp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename setenv-android.sh to setenv-android-gcc.sh (GH #637) 

This makes room for a Clang/LLVM version of the script
pull/646/head
Jeffrey Walton 2018-04-19 22:39:07 -04:00
parent bdd0f02867
commit e2bc3b55ca
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
TestScripts/setenv-android.sh → TestScripts/setenv-android-gcc.sh
View File

@ -71,7 +71,7 @@ if [ -z "${AOSP_API-}" ]; then
else else
echo "WARNING: Using AOSP_API has been deprecated. Please use AOSP_API_VERSION instead." echo "WARNING: Using AOSP_API has been deprecated. Please use AOSP_API_VERSION instead."
echo "If you set for example AOSP_API=android-23 then now instead set AOSP_API_VERSION=23" echo "If you set for example AOSP_API=android-23 then now instead set AOSP_API_VERSION=23"
exit 1 [ "$0" = "$BASH_SOURCE" ] && exit 1 || return 1
fi fi
##################################################################### #####################################################################
@ -126,8 +126,8 @@ case "$THE_ARCH" in
AOSP_FLAGS="-march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp -DCRYPTOPP_DISABLE_ASM -Wl,--fix-cortex-a8 -funwind-tables -fexceptions -frtti" AOSP_FLAGS="-march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp -DCRYPTOPP_DISABLE_ASM -Wl,--fix-cortex-a8 -funwind-tables -fexceptions -frtti"
;; ;;
hard|armv7a-hard|armeabi-v7a-hard) hard|armv7a-hard|armeabi-v7a-hard)
echo hard, armv7a-hard and armeabi-v7a-hard are not supported, as android uses softfloats echo hard, armv7a-hard and armeabi-v7a-hard are not supported, as android uses softfloats
exit 1 [ "$0" = "$BASH_SOURCE" ] && exit 1 || return 1
#TOOLCHAIN_ARCH="arm-linux-androideabi" #TOOLCHAIN_ARCH="arm-linux-androideabi"
#TOOLCHAIN_NAME="arm-linux-androideabi" #TOOLCHAIN_NAME="arm-linux-androideabi"
#AOSP_ABI="armeabi-v7a" #AOSP_ABI="armeabi-v7a"

6
setenv-android.sh → setenv-android-gcc.sh
View File

@ -71,7 +71,7 @@ if [ -z "${AOSP_API-}" ]; then
else else
echo "WARNING: Using AOSP_API has been deprecated. Please use AOSP_API_VERSION instead." echo "WARNING: Using AOSP_API has been deprecated. Please use AOSP_API_VERSION instead."
echo "If you set for example AOSP_API=android-23 then now instead set AOSP_API_VERSION=23" echo "If you set for example AOSP_API=android-23 then now instead set AOSP_API_VERSION=23"
exit 1 [ "$0" = "$BASH_SOURCE" ] && exit 1 || return 1
fi fi
##################################################################### #####################################################################
@ -126,8 +126,8 @@ case "$THE_ARCH" in
AOSP_FLAGS="-march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp -DCRYPTOPP_DISABLE_ASM -Wl,--fix-cortex-a8 -funwind-tables -fexceptions -frtti" AOSP_FLAGS="-march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp -DCRYPTOPP_DISABLE_ASM -Wl,--fix-cortex-a8 -funwind-tables -fexceptions -frtti"
;; ;;
hard|armv7a-hard|armeabi-v7a-hard) hard|armv7a-hard|armeabi-v7a-hard)
echo hard, armv7a-hard and armeabi-v7a-hard are not supported, as android uses softfloats echo hard, armv7a-hard and armeabi-v7a-hard are not supported, as android uses softfloats
exit 1 [ "$0" = "$BASH_SOURCE" ] && exit 1 || return 1
#TOOLCHAIN_ARCH="arm-linux-androideabi" #TOOLCHAIN_ARCH="arm-linux-androideabi"
#TOOLCHAIN_NAME="arm-linux-androideabi" #TOOLCHAIN_NAME="arm-linux-androideabi"
#AOSP_ABI="armeabi-v7a" #AOSP_ABI="armeabi-v7a"