diff options
| author | Jeffrey Walton <noloader@gmail.com> | 2017-09-13 17:00:52 -0400 |
|---|---|---|
| committer | Jeffrey Walton <noloader@gmail.com> | 2017-09-13 17:00:52 -0400 |
| commit | 40859a80da32ed0974580871e2053c37c7817a3a (patch) | |
| tree | b8925c758ccf0230bcc205a603e2daa910f10ffb /TestScripts | |
| parent | fca8adc54976fe82dffcbe5abb18c8912eedf41e (diff) | |
| download | cryptopp-git-40859a80da32ed0974580871e2053c37c7817a3a.tar.gz | |
Improve detection of ANDROID_NDK_ROOT
We were searching for R10 NDK's, but Android is at R15 in 2017
Diffstat (limited to 'TestScripts')
| -rwxr-xr-x | TestScripts/setenv-android.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/TestScripts/setenv-android.sh b/TestScripts/setenv-android.sh index af59640a..b14d605a 100755 --- a/TestScripts/setenv-android.sh +++ b/TestScripts/setenv-android.sh @@ -71,13 +71,13 @@ fi # like ANDROID_NDK_ROOT=/opt/android-ndk-r10e or ANDROID_NDK_ROOT=/usr/local/android-ndk-r10e. if [ -z "${ANDROID_NDK_ROOT-}" ]; then - ANDROID_NDK_ROOT=$(find /opt -maxdepth 1 -type d -name android-ndk-r10* 2>/dev/null | tail -1) + ANDROID_NDK_ROOT=$(find /opt -maxdepth 1 -type d -name android-ndk* 2>/dev/null | tail -1) if [ -z "$ANDROID_NDK_ROOT" ]; then - ANDROID_NDK_ROOT=$(find /usr/local -maxdepth 1 -type d -name android-ndk-r10* 2>/dev/null | tail -1) + ANDROID_NDK_ROOT=$(find /usr/local -maxdepth 1 -type d -name android-ndk* 2>/dev/null | tail -1) fi if [ -z "$ANDROID_NDK_ROOT" ]; then - ANDROID_NDK_ROOT=$(find $HOME -maxdepth 1 -type d -name android-ndk-r10* 2>/dev/null | tail -1) + ANDROID_NDK_ROOT=$(find $HOME -maxdepth 1 -type d -name android-ndk* 2>/dev/null | tail -1) fi if [ -d "$HOME/Library/Android/sdk/ndk-bundle" ]; then ANDROID_NDK_ROOT="$HOME/Library/Android/sdk/ndk-bundle" @@ -154,7 +154,7 @@ case "$THE_ARCH" in TOOLCHAIN_NAME="i686-linux-android" AOSP_ABI="x86" AOSP_ARCH="arch-x86" - AOSP_FLAGS="-march=i686 -mtune=intel -mssse3 -mfpmath=sse -funwind-tables -fexceptions -frtti" + AOSP_FLAGS="-mtune=intel -mssse3 -mfpmath=sse -funwind-tables -fexceptions -frtti" ;; x86_64|x64) TOOLCHAIN_ARCH="x86_64" |