summaryrefslogtreecommitdiff
path: root/ci
diff options
context:
space:
mode:
authorjandegr <jandegr@users.noreply.github.com>2015-12-31 15:52:11 +0100
committerjandegr <jandegr@users.noreply.github.com>2015-12-31 15:52:11 +0100
commitda791ce5080703ad473aa4034a4ad401254f3238 (patch)
tree3a462b3f6fcde20111989cabc237d294b2e46ce8 /ci
parent3de77b1c8df00801dda9801527de0c0f36cc0b96 (diff)
downloadnavit-da791ce5080703ad473aa4034a4ad401254f3238.tar.gz
Update build_android_x86.sh
Diffstat (limited to 'ci')
-rw-r--r--ci/build_android_x86.sh6
1 files changed, 5 insertions, 1 deletions
diff --git a/ci/build_android_x86.sh b/ci/build_android_x86.sh
index c91e5c0b8..ed7fe42ed 100644
--- a/ci/build_android_x86.sh
+++ b/ci/build_android_x86.sh
@@ -1,7 +1,11 @@
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
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