diff options
Diffstat (limited to 'ci/build_android_x86.sh')
| -rw-r--r-- | ci/build_android_x86.sh | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/ci/build_android_x86.sh b/ci/build_android_x86.sh index 022b7f5af..c5a421cbe 100644 --- a/ci/build_android_x86.sh +++ b/ci/build_android_x86.sh @@ -1,32 +1,37 @@ +#!/bin/bash +set -e + +export arch="x86" export START_PATH=~/ export SOURCE_PATH=$START_PATH"/"${CIRCLE_PROJECT_REPONAME}"/" export CMAKE_FILE=$SOURCE_PATH"/Toolchain/i686-android.cmake" -export ANDROID_NDK=~/android-ndk-r13 +export ANDROID_NDK=~/android-ndk-r11c export ANDROID_NDK_BIN=$ANDROID_NDK"/toolchains/x86-4.9/prebuilt/linux-x86_64/bin" export ANDROID_SDK="/usr/local/android-sdk-linux/" export ANDROID_SDK_PLATFORM_TOOLS=$ANDROID_SDK"/platform-tools" export PATH=$ANDROID_NDK_BIN:$ANDROID_SDK_PLATFORM_TOOLS:$PATH -export BUILD_PATH=$START_PATH"/android-x86" +export BUILD_PATH=$START_PATH"/android-${ARCH}" -wget -nv -c http://dl.google.com/android/repository/android-ndk-r13-linux-x86_64.zip -unzip -q -d ~ android-ndk-r13-linux-x86_64.zip +wget -nv -c http://dl.google.com/android/repository/android-ndk-r11c-linux-x86_64.zip +[ -d ~/android-ndk-r11c ] || unzip -q -d ~ android-ndk-r11c-linux-x86_64.zip [ -d $BUILD_PATH ] || mkdir -p $BUILD_PATH cd $BUILD_PATH android list targets -cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_FILE -DAVOID_FLOAT=1 -DSAMPLE_MAP=n -DBUILD_MAPTOOL=n -DANDROID_API_VERSION=23 -DANDROID_NDK_API_VERSION=19 -DDISABLE_CXX=1 -DDISABLE_QT=1 $SOURCE_PATH || exit -1 -make || exit -1 +cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_FILE -DAVOID_FLOAT=1 -DSAMPLE_MAP=n -DBUILD_MAPTOOL=n -DANDROID_API_VERSION=23 -DANDROID_NDK_API_VERSION=19 -DDISABLE_CXX=1 -DDISABLE_QT=1 $SOURCE_PATH +make if [[ "${CIRCLE_BRANCH}" == "master" ]]; then - make apkg-release && mv navit/android/bin/Navit-release-unsigned.apk $CIRCLE_ARTIFACTS/navit-$CIRCLE_SHA1-x86-release-unsigned.apk || exit 1 + make apkg-release && mv $BUILD_PATH/navit/android/bin/Navit-release-unsigned.apk $CIRCLE_ARTIFACTS/navit-$CIRCLE_SHA1-${ARCH}-release-unsigned.apk || exit 1 else - make apkg && mv navit/android/bin/Navit-debug.apk $CIRCLE_ARTIFACTS/navit-$CIRCLE_SHA1-x86-debug.apk || exit 1 + make apkg && mv $BUILD_PATH/navit/android/bin/Navit-debug.apk $CIRCLE_ARTIFACTS/navit-$CIRCLE_SHA1-${ARCH}-debug.apk || exit 1 fi -#cp ~/android-build/navit/*.xml $CIRCLE_ARTIFACTS/android/ +[ -d $CIRCLE_ARTIFACTS/android-${ARCH}/ ] || mkdir $CIRCLE_ARTIFACTS/android-${ARCH}/ +cp $BUILD_PATH/navit/*.xml $CIRCLE_ARTIFACTS/android-${ARCH}/ echo echo "Build leftovers :" -ls navit/android/bin/ +ls $BUILD_PATH |