diff options
Diffstat (limited to 'ci/build_android_x86.sh')
-rw-r--r-- | ci/build_android_x86.sh | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/ci/build_android_x86.sh b/ci/build_android_x86.sh index 6755ad347..022b7f5af 100644 --- a/ci/build_android_x86.sh +++ b/ci/build_android_x86.sh @@ -1,17 +1,22 @@ 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=~/android-ndk-r13 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" -mkdir android-x86 && cd android-x86 +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 + +[ -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=21 -DANDROID_NDK_API_VERSION=19 -DDISABLE_CXX=1 -DDISABLE_QT=1 ../ || 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 || exit -1 make || exit -1 if [[ "${CIRCLE_BRANCH}" == "master" ]]; then |