diff options
| -rwxr-xr-x | Toolchain/i686-android.cmake | 6 | ||||
| -rw-r--r-- | ci/build_android_x86.sh | 27 | ||||
| -rw-r--r-- | circle.yml | 3 |
3 files changed, 33 insertions, 3 deletions
diff --git a/Toolchain/i686-android.cmake b/Toolchain/i686-android.cmake index 94c6197e5..2b6e8a177 100755 --- a/Toolchain/i686-android.cmake +++ b/Toolchain/i686-android.cmake @@ -5,8 +5,8 @@ set(ANDROID_API_VERSION 9 CACHE STRING "Andriod API Version") set(ANDROID_NDK_API_VERSION ${ANDROID_API_VERSION} CACHE STRING "Andriod NDK API Version") set(ANDROID_ARCH "x86" CACHE STRING "Android architecture") -find_program(CMAKE_C_COMPILER NAMES i686-android-linux-gcc i686-android-linux-gcc.exe) -find_program(CMAKE_CXX_COMPILER NAMES i686-android-linux-g++ i686-android-linux-g++.exe) +find_program(CMAKE_C_COMPILER NAMES i686-linux-android-gcc i686-linux-android-gcc.exe) +find_program(CMAKE_CXX_COMPILER NAMES i686-linux-android-g++ i686-linux-android-g++.exe) set(PKG_CONFIG_EXECUTABLE "i686-android-pkg-config") get_filename_component(COMPILER_PATH ${CMAKE_C_COMPILER} PATH) @@ -16,7 +16,7 @@ set(ANDROID_NDK "${COMPILER_PATH}/../../../../.." CACHE STRING "PATH to Andriod set(NDK_ARCH_DIR "${ANDROID_NDK}/platforms/android-${ANDROID_NDK_API_VERSION}/arch-x86") set(CMAKE_FIND_ROOT_PATH ${NDK_ARCH_DIR}) -set(CMAKE_REQUIRED_FLAGS "-nostdlib -lc -ldl -lgcc -L${NDK_ARCH_DIR}/usr/lib") +set(CMAKE_REQUIRED_FLAGS "-ldl --sysroot=${NDK_ARCH_DIR} ${EXTRA_COMPILER_FLAGS}") set(CMAKE_REQUIRED_INCLUDES "${NDK_ARCH_DIR}/usr/include") set(NAVIT_COMPILE_FLAGS "-I${NDK_ARCH_DIR}/usr/include -g -D_GNU_SOURCE -DANDROID -fno-short-enums ${CMAKE_REQUIRED_FLAGS}") diff --git a/ci/build_android_x86.sh b/ci/build_android_x86.sh new file mode 100644 index 000000000..695556e07 --- /dev/null +++ b/ci/build_android_x86.sh @@ -0,0 +1,27 @@ +export START_PATH=~/ +export SOURCE_PATH=$START_PATH"/"${CIRCLE_PROJECT_REPONAME}"/" +export CMAKE_FILE=$SOURCE_PATH"/Toolchain/i686-android.cmake" +export ANDROID_NDK="/usr/local/android-ndk/" +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 + +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/ diff --git a/circle.yml b/circle.yml index 419899bd0..76e41196b 100644 --- a/circle.yml +++ b/circle.yml @@ -30,6 +30,7 @@ dependencies: - sudo apt-get install lib32stdc++6 - sudo apt-get install lib32z1 - bash ci/build_android.sh + - bash ci/build_android_x86.sh # Windows build - sudo apt-get install mingw32 mingw32-binutils mingw32-runtime - sudo apt-get install default-jdk nsis @@ -41,6 +42,8 @@ dependencies: - cp win32/*.exe $CIRCLE_ARTIFACTS/ # For python testing with junit reporting - sudo pip install junit-xml +# + - ls -la $CIRCLE_ARTIFACTS test: post: - sed -i -e 's@name="Local GPS" profilename="car" enabled="yes" active="1"@name="Local GPS" profilename="car" enabled="no" active="0"@' navit.xml: |