diff options
| author | Pierre Grandin <grandinp@gmail.com> | 2017-09-01 12:39:38 -0700 |
|---|---|---|
| committer | Pierre Grandin <grandinp@gmail.com> | 2017-09-01 12:39:38 -0700 |
| commit | 1595e25e873b4a96df83e1f6942014be31db7295 (patch) | |
| tree | e58f09654443bb16c40a1070d298a1f4ebdbdedd | |
| parent | 13655eae460ad2a103afb97614f016305b16fed3 (diff) | |
| download | navit-1595e25e873b4a96df83e1f6942014be31db7295.tar.gz | |
Fixed toolchain misconfiguration
| -rw-r--r-- | ci/build_android_x86.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ci/build_android_x86.sh b/ci/build_android_x86.sh index a9d4743e5..bef6dbcfa 100644 --- a/ci/build_android_x86.sh +++ b/ci/build_android_x86.sh @@ -27,7 +27,7 @@ pushd $BUILD_PATH android list targets -cmake -DCMAKE_TOOLCHAIN_FILE=../Toolchain/arm-eabi.cmake -DAVOID_FLOAT=1 -DSAMPLE_MAP=n -DBUILD_MAPTOOL=n -DANDROID_API_VERSION=25 -DANDROID_NDK_API_VERSION=19 -DDISABLE_CXX=1 -DDISABLE_QT=1 .. +cmake -DCMAKE_TOOLCHAIN_FILE=../Toolchain/i686-android.cmake -DAVOID_FLOAT=1 -DSAMPLE_MAP=n -DBUILD_MAPTOOL=n -DANDROID_API_VERSION=25 -DANDROID_NDK_API_VERSION=19 -DDISABLE_CXX=1 -DDISABLE_QT=1 .. make -j $(nproc --all) if [[ "${CIRCLE_BRANCH}" == "master" ]]; then |