Fixes and improvements

This commit is contained in:
Gerhard Stein
2016-12-03 14:18:33 +01:00
parent 1194788eb9
commit 616a69a5c5
7 changed files with 41 additions and 56 deletions

View File

@@ -36,6 +36,9 @@ case "${NDK_REV}" in
# Zip archive.
pushd "${BASE}/sdk"
unzip "${NDK_ARCHIVE}" || exit 1
#ln -s "/home/gerstrong/apps/android-dev/android-ndk-r${NDK_REV}-$(uname -s | tr '[A-Z]' '[a-z]')-${NDK_ARCH}" android-ndk-r${NDK_REV}-$(uname -s | tr '[A-Z]' '[a-z]')-${NDK_ARCH}
popd
fi
;;

View File

@@ -15,14 +15,12 @@ export NDK_PLATFORM="android-${NDK_REV}"
export SDK_PLATFORM="android-${SDK_REV}"
export cross="${ANDROID_TARGET}-"
export PLATFORMVER="android-24"
export PREFIX="$NDK_PATH/platforms/$PLATFORMVER/arch-arm/usr"
export CFLAGS="--sysroot ${TOOL_PREFIX}/sysroot -I${PREFIX}/include -I${TOOL_PREFIX}/include -DANDROID -mandroid ${CFLAGS_EXTRA}"
export CPPFLAGS="${CFLAGS} ${CPPFLAGS_EXTRA}"
export CXXFLAGS="${CFLAGS} ${CXXFLAGS_EXTRA}"
export LDFLAGS="--sysroot ${TOOL_PREFIX}/sysroot -L${PREFIX}/lib -L${TOOL_PREFIX}/lib ${LDFLAGS_EXTRA}"
export CC="${ANDROID_TARGET}-gcc"
export CXX="${ANDROID_TARGET}-g++"
export CPP="${ANDROID_TARGET}-cpp"

View File

@@ -1,22 +0,0 @@
ANDROID_AGREE_LICENSE_TERMS=n
ANDROID_API_LEVEL=21
ANDROID_COMPILER=4.9
ANDROID_DEV=/home/gerstrong/apps/android-dev/android-ndk-r13b/platforms/android-14/arch-arm/usr
ANDROID_EMULATOR_OPTIONS=
ANDROID_EMULATOR_TESTDIR=/data/py3
ANDROID_HOST=x86_64-pc-linux-gnu
ANDROID_PLATFORM=arm
ANDROID_PREFIX=/home/gerstrong/apps/android-dev/android-ndk-r13b/build
ANDROID_TARGET=arm-linux-androideabi
ANDROID_TEST_PREFIX=/home/gerstrong/apps/android-dev/android-ndk-r13b/build-vm
ANDROID_TOOLCHAIN=arm-linux-androideabi-4.9
ANDROID_TOOL_PREFIX=/home/gerstrong/apps/android-dev/android-ndk-r13b/build-tools
ANDROID_VM_NAME=PythonTesting
BUILD_IDENTIFIER=13b-21-arm-linux-androideabi-4.9
NDK_PATH=/home/gerstrong/apps/android-dev/android-ndk-r13b
NDK_REL=android-ndk-r13b
NDK_REV=13b
PYTHON_OPTIONAL_MODULES='bz2 lzma ssl'
SDK_REL=android-sdk-r24.0.2
SDK_REV=24.0.2
TEST_IDENTIFIER=24.0.2-21-arm