diff options
| author | Jeffrey Walton <noloader@gmail.com> | 2022-12-27 09:06:57 -0500 |
|---|---|---|
| committer | Jeffrey Walton <noloader@gmail.com> | 2022-12-27 09:06:57 -0500 |
| commit | f799578860a1a43a0c84504d04dc1cd3e1980a07 (patch) | |
| tree | fcb6469651d12b9a2b3b9526fab76a54473590fe | |
| parent | fe726ffb5b437c5c92eccb75288225c487ab6507 (diff) | |
| download | cryptopp-git-f799578860a1a43a0c84504d04dc1cd3e1980a07.tar.gz | |
Update Android setenv script for r22 tools
| -rwxr-xr-x | TestScripts/setenv-android.sh | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/TestScripts/setenv-android.sh b/TestScripts/setenv-android.sh index cb118707..d61d438f 100755 --- a/TestScripts/setenv-android.sh +++ b/TestScripts/setenv-android.sh @@ -219,6 +219,14 @@ case "$ANDROID_CPU" in LD="arm-linux-androideabi-ld.gold" fi + # As of NDK r22, there are new names for some tools + # https://developer.android.com/ndk/guides/other_build_systems + if [ "${ANDROID_API}" -ge 22 ]; then + AR="llvm-ar" + RANLIB="llvm-ranlib" + STRIP="llvm-strip" + fi + # You may need this on older NDKs # ANDROID_CPPFLAGS="-D__ANDROID__=${ANDROID_API}" @@ -258,6 +266,14 @@ case "$ANDROID_CPU" in LD="aarch64-linux-android-ld.bfd" fi + # As of NDK r22, there are new names for some tools + # https://developer.android.com/ndk/guides/other_build_systems + if [ "${ANDROID_API}" -ge 22 ]; then + AR="llvm-ar" + RANLIB="llvm-ranlib" + STRIP="llvm-strip" + fi + # You may need this on older NDKs # ANDROID_CPPFLAGS="-D__ANDROID__=${ANDROID_API}" @@ -291,6 +307,14 @@ case "$ANDROID_CPU" in LD="i686-linux-android-ld.gold" fi + # As of NDK r22, there are new names for some tools + # https://developer.android.com/ndk/guides/other_build_systems + if [ "${ANDROID_API}" -ge 22 ]; then + AR="llvm-ar" + RANLIB="llvm-ranlib" + STRIP="llvm-strip" + fi + # You may need this on older NDKs # ANDROID_CPPFLAGS="-D__ANDROID__=${ANDROID_API}" @@ -326,6 +350,14 @@ case "$ANDROID_CPU" in LD="x86_64-linux-android-ld.gold" fi + # As of NDK r22, there are new names for some tools + # https://developer.android.com/ndk/guides/other_build_systems + if [ "${ANDROID_API}" -ge 22 ]; then + AR="llvm-ar" + RANLIB="llvm-ranlib" + STRIP="llvm-strip" + fi + # You may need this on older NDKs # ANDROID_CPPFLAGS="-D__ANDROID__=${ANDROID_API}" |