cheng/libsodium
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Android: use PLATFORM 16 by default, don't bother with compat for API 21

Browse Source
This commit is contained in:
Frank Denis 2017-05-20 19:16:05 +02:00
parent 70bffa111a
commit 51e6a59b8d
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dist-build/android-armv8-a.sh
View File

@ -1,4 +1,4 @@
#!/bin/sh #!/bin/sh
export TARGET_ARCH=armv8-a export TARGET_ARCH=armv8-a
export CFLAGS="-Os -march=${TARGET_ARCH}" export CFLAGS="-Os -march=${TARGET_ARCH}"
NDK_PLATFORM_COMPAT=android-21 ARCH=arm64 HOST_COMPILER=aarch64-linux-android "$(dirname "$0")/android-build.sh" NDK_PLATFORM=android-21 ARCH=arm64 HOST_COMPILER=aarch64-linux-android "$(dirname "$0")/android-build.sh"

12
dist-build/android-build.sh
View File

@ -1,11 +1,9 @@
#! /bin/sh #! /bin/sh
if [ -z "$NDK_PLATFORM" ]; then if [ -z "$NDK_PLATFORM" ]; then
export NDK_PLATFORM="android-24" export NDK_PLATFORM="android-16"
export NDK_PLATFORM_COMPAT="${NDK_PLATFORM_COMPAT:-android-16}"
else
export NDK_PLATFORM_COMPAT="${NDK_PLATFORM_COMPAT:-${NDK_PLATFORM}}"
fi fi
export NDK_PLATFORM_COMPAT="${NDK_PLATFORM_COMPAT:-${NDK_PLATFORM}}"
export NDK_API_VERSION=$(echo "$NDK_PLATFORM" | sed 's/^android-//') export NDK_API_VERSION=$(echo "$NDK_PLATFORM" | sed 's/^android-//')
export NDK_API_VERSION_COMPAT=$(echo "$NDK_PLATFORM_COMPAT" | sed 's/^android-//') export NDK_API_VERSION_COMPAT=$(echo "$NDK_PLATFORM_COMPAT" | sed 's/^android-//')
@ -36,7 +34,11 @@ export CC=${CC:-"${HOST_COMPILER}-clang"}
rm -rf "${TOOLCHAIN_DIR}" "${PREFIX}" rm -rf "${TOOLCHAIN_DIR}" "${PREFIX}"
echo echo
echo "Building for platform [${NDK_PLATFORM}], retaining compatibility with platform [${NDK_PLATFORM_COMPAT}]" if [ "$NDK_PLATFORM" != "$NDK_PLATFORM_COMPAT" ]; then
echo "Building for platform [${NDK_PLATFORM}], retaining compatibility with platform [${NDK_PLATFORM_COMPAT}]"
else
echo "Building for platform [${NDK_PLATFORM}]"
fi
echo echo
env - PATH="$PATH" \ env - PATH="$PATH" \

2
dist-build/android-mips64.sh
View File

@ -1,4 +1,4 @@
#!/bin/sh #!/bin/sh
export TARGET_ARCH=mips64r6 export TARGET_ARCH=mips64r6
export CFLAGS="-Os -march=${TARGET_ARCH}" export CFLAGS="-Os -march=${TARGET_ARCH}"
CC="mips64el-linux-android-gcc" NDK_PLATFORM_COMPAT=android-21 ARCH=mips64 HOST_COMPILER=mips64el-linux-android "$(dirname "$0")/android-build.sh" CC="mips64el-linux-android-gcc" NDK_PLATFORM=android-21 ARCH=mips64 HOST_COMPILER=mips64el-linux-android "$(dirname "$0")/android-build.sh"

2
dist-build/android-x86_64.sh
View File

@ -1,4 +1,4 @@
#!/bin/sh #!/bin/sh
export TARGET_ARCH=westmere export TARGET_ARCH=westmere
export CFLAGS="-Os -march=${TARGET_ARCH}" export CFLAGS="-Os -march=${TARGET_ARCH}"
NDK_PLATFORM_COMPAT=android-21 ARCH=x86_64 HOST_COMPILER=x86_64-linux-android "$(dirname "$0")/android-build.sh" NDK_PLATFORM=android-21 ARCH=x86_64 HOST_COMPILER=x86_64-linux-android "$(dirname "$0")/android-build.sh"