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

Do not require droid-gcc any more to compile for Android

Browse Source
This commit is contained in:
Frank Denis 2013-12-31 16:06:19 +01:00
parent b5b250e0ba
commit b989d28925
2 changed files with 15 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -27,6 +27,7 @@ confdefs.h
config.* config.*
configure configure
depcomp depcomp
android-toolchain
install-sh install-sh
libtool libtool
libsodium.pc libsodium.pc

41
dist-build/android.sh
View File

@ -1,45 +1,32 @@
#! /bin/sh #! /bin/sh
# Note that this script requires droid-wrapper
if [ x`which droid-gcc` = x ]; then
echo "This build script requires droid-wrapper."
echo https://github.com/jevinskie/droid-wrapper
exit 1
fi
if [ -z "$NDK_ROOT" ]; then if [ -z "$NDK_ROOT" ]; then
echo "You should probably set NDK_ROOT to the directory containing" echo "You should probably set NDK_ROOT to the directory containing"
echo "the Android NDK" echo "the Android NDK"
fi fi
if [ ! -f ./configure ]; then if [ ! -f ./configure ]; then
echo "Can't find ./configure. Wrong directory or haven't run autogen.sh?" echo "Can't find ./configure. Wrong directory or haven't run autogen.sh?"
exit 1 exit 1
fi fi
export CFLAGS="-Os -mthumb" export NDK_PLATFORM=${NDK_PLATFORM:-android-14}
export DROID_HOST=darwin-x86
if uname -a | grep -q -i linux; then
export DROID_HOST=linux-x86
fi
export LDFLAGS="-mthumb"
export NDK_PLATFORM=9
export NDK_ROOT=${NDK_ROOT:-/usr/local/Cellar/android-ndk/9} export NDK_ROOT=${NDK_ROOT:-/usr/local/Cellar/android-ndk/9}
export NDK_ANDROID_SOURCES="${NDK_ROOT}/sources/android" export TARGET_ARCH=arm
export TARGET_TOOLCHAIN_VERSION=4.6 export TARGET="${TARGET_ARCH}-linux-androideabi"
export TARGET=arm-linux-androideabi export MAKE_TOOLCHAIN="${NDK_ROOT}/build/tools/make-standalone-toolchain.sh"
export NDK_TARGET="arm-linux-androideabi-${TARGET_TOOLCHAIN_VERSION}"
export AR=droid-ar
export AS=droid-as
export CC=droid-gcc
export LD=droid-ld
export NM=droid-nm
export OBJCOPY=droid-objcopy
export RANLIB=droid-ranlib
export STRIP=droid-strip
export PREFIX="$(pwd)/libsodium-android" export PREFIX="$(pwd)/libsodium-android"
export TOOLCHAIN_DIR="$(pwd)/android-toolchain"
export PATH="${PATH}:${TOOLCHAIN_DIR}"
export CFLAGS="-Os -mthumb"
export LDFLAGS="-mthumb"
$MAKE_TOOLCHAIN --platform="$NDK_PLATFORM" --arch="$TARGET_ARCH" \
--install-dir="$TOOLCHAIN_DIR"
./configure --host=arm-linux-androideabi \ ./configure --host=arm-linux-androideabi \
--with-sysroot="${TOOLCHAIN_DIR}/sysroot" \
--disable-pie \ --disable-pie \
--disable-shared \ --disable-shared \
--prefix="$PREFIX" && \ --prefix="$PREFIX" && \