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

Revert "+x"

Browse Source 
This reverts commit 8465469167.
This commit is contained in:
Frank Denis 2017-03-06 10:06:24 +01:00
parent 0ce35c3066
commit 3e56ce235d
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,6 +6,8 @@ if [ -z "$NDK_PLATFORM" ]; then
else else
export NDK_PLATFORM_COMPAT="${NDK_PLATFORM_COMPAT:-${NDK_PLATFORM}}" export NDK_PLATFORM_COMPAT="${NDK_PLATFORM_COMPAT:-${NDK_PLATFORM}}"
fi fi
export NDK_API_VERSION=$(echo "$NDK_PLATFORM" | sed 's/^android-//')
export NDK_API_VERSION_COMPAT=$(echo "$NDK_PLATFORM_COMPAT" | sed 's/^android-//')
if [ -z "$ANDROID_NDK_HOME" ]; then if [ -z "$ANDROID_NDK_HOME" ]; then
echo "You should probably set ANDROID_NDK_HOME to the directory containing" echo "You should probably set ANDROID_NDK_HOME to the directory containing"
@ -23,7 +25,7 @@ if [ "x$TARGET_ARCH" = 'x' ] || [ "x$ARCH" = 'x' ] || [ "x$HOST_COMPILER" = 'x'
exit 1 exit 1
fi fi
export MAKE_TOOLCHAIN="${ANDROID_NDK_HOME}/build/tools/make-standalone-toolchain.sh" export MAKE_TOOLCHAIN="${ANDROID_NDK_HOME}/build/tools/make_standalone_toolchain.py"
export PREFIX="$(pwd)/libsodium-android-${TARGET_ARCH}" export PREFIX="$(pwd)/libsodium-android-${TARGET_ARCH}"
export TOOLCHAIN_DIR="$(pwd)/android-toolchain-${TARGET_ARCH}" export TOOLCHAIN_DIR="$(pwd)/android-toolchain-${TARGET_ARCH}"
@ -35,8 +37,9 @@ echo
echo "Building for platform [${NDK_PLATFORM}], retaining compatibility with platform [${NDK_PLATFORM_COMPAT}]" echo "Building for platform [${NDK_PLATFORM}], retaining compatibility with platform [${NDK_PLATFORM_COMPAT}]"
echo echo
bash $MAKE_TOOLCHAIN --force --platform="$NDK_PLATFORM_COMPAT" \ env - PATH="$PATH" \
--arch="$ARCH" --install-dir="$TOOLCHAIN_DIR" || exit 1 $MAKE_TOOLCHAIN --force --api="$NDK_API_VERSION_COMPAT" \
--unified-headers --arch="$ARCH" --install-dir="$TOOLCHAIN_DIR" || exit 1
./configure \ ./configure \
--disable-soname-versions \ --disable-soname-versions \
@ -50,8 +53,9 @@ if [ "$NDK_PLATFORM" != "$NDK_PLATFORM_COMPAT" ]; then
echo echo
echo "Configuring again for platform [${NDK_PLATFORM}]" echo "Configuring again for platform [${NDK_PLATFORM}]"
echo echo
bash $MAKE_TOOLCHAIN --force --platform="$NDK_PLATFORM" \ env - PATH="$PATH" \
--arch="$ARCH" --install-dir="$TOOLCHAIN_DIR" || exit 1 $MAKE_TOOLCHAIN --force --api="$NDK_API_VERSION" \
--unified-headers --arch="$ARCH" --install-dir="$TOOLCHAIN_DIR" || exit 1
./configure \ ./configure \
--disable-soname-versions \ --disable-soname-versions \