From 98f8cf8a5473ca02a7ac6735c15dfdf8bd065b38 Mon Sep 17 00:00:00 2001 From: jandegr Date: Fri, 1 Jan 2016 19:19:25 +0100 Subject: Update build_android_x86.sh --- ci/build_android_x86.sh | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'ci') diff --git a/ci/build_android_x86.sh b/ci/build_android_x86.sh index ed7fe42ed..695556e07 100644 --- a/ci/build_android_x86.sh +++ b/ci/build_android_x86.sh @@ -8,5 +8,20 @@ export ANDROID_SDK_PLATFORM_TOOLS=$ANDROID_SDK"/platform-tools" export PATH=$ANDROID_NDK_BIN:$ANDROID_SDK_PLATFORM_TOOLS:$PATH mkdir android-x86 && cd android-x86 + +android list targets + cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_FILE -DAVOID_FLOAT=1 -DSAMPLE_MAP=n -DBUILD_MAPTOOL=n -DANDROID_API_VERSION=19 -DDISABLE_CXX=1 -DDISABLE_QT=1 ../ || exit -1 make || exit -1 + +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 +else + make apkg && mv navit/android/bin/Navit-debug.apk $CIRCLE_ARTIFACTS/navit-$CIRCLE_SHA1-x86-debug.apk || exit 1 +fi + +#cp ~/android-build/navit/*.xml $CIRCLE_ARTIFACTS/android/ + +echo +echo "Build leftovers :" +ls navit/android/bin/ -- cgit v1.2.1