diff options
| author | Pierre Grandin <grandinp@gmail.com> | 2017-08-30 16:42:58 -0700 |
|---|---|---|
| committer | Pierre Grandin <grandinp@gmail.com> | 2017-08-30 16:42:58 -0700 |
| commit | e67a1df350fdbb55b7c3a0152fa3bacdabac5f7f (patch) | |
| tree | 3963c0022cde5908861269b776c7c429421c2a14 | |
| parent | 5dcfef4258f03becf74cde04cff6b345ef5ffd5d (diff) | |
| download | navit-e67a1df350fdbb55b7c3a0152fa3bacdabac5f7f.tar.gz | |
Adapting build path
| -rw-r--r-- | ci/build_android.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ci/build_android.sh b/ci/build_android.sh index 451b6176c..f1265774a 100644 --- a/ci/build_android.sh +++ b/ci/build_android.sh @@ -12,7 +12,7 @@ export ANDROID_NDK_BIN=$ANDROID_NDK"/toolchains/arm-linux-androideabi-4.9/prebui 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-${ARCH}" +export BUILD_PATH=android-${ARCH} export ANDROID_SDK_HOME=/opt/android-sdk-linux export ANDROID_HOME=/opt/android-sdk-linux @@ -27,6 +27,8 @@ pushd $BUILD_PATH android list targets cmake -DCMAKE_TOOLCHAIN_FILE=../Toolchain/arm-eabi.cmake -DCACHE_SIZE='(20*1024*1024)' -DAVOID_FLOAT=1 -DSAMPLE_MAP=n -DBUILD_MAPTOOL=n -DANDROID_API_VERSION=25 -DANDROID_NDK_API_VERSION=19 ../ +cmake -DCMAKE_TOOLCHAIN_FILE=../Toolchain/arm-eabi.cmake -DCACHE_SIZE='(20*1024*1024)' -DAVOID_FLOAT=1 -DSAMPLE_MAP=n -DBUILD_MAPTOOL=n -DANDROID_API_VERSION=25 -DANDROID_NDK_API_VERSION=19 .. + make -j $(nproc --all) if [[ "${CIRCLE_BRANCH}" == "master" ]]; then |