summaryrefslogtreecommitdiff
path: root/ci
diff options
context:
space:
mode:
authorkazer_ <kazer_@ffa7fe5e-494d-0410-b361-a75ebd5db220>2015-04-07 18:06:06 +0000
committerkazer_ <kazer_@ffa7fe5e-494d-0410-b361-a75ebd5db220>2015-04-07 18:06:06 +0000
commita910fd96d077996c9d2281a3e0b6f49fdeea1f89 (patch)
treeb8dbcd6bfa2f52c22c02c6717d9bb3b392896efe /ci
parent9d73f97a88a89e9e3c49ce7942baa5ef045892e2 (diff)
downloadnavit-svn-a910fd96d077996c9d2281a3e0b6f49fdeea1f89.tar.gz
Update:CI:Fixed a wrong path in android build script
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@6057 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'ci')
-rw-r--r--ci/build_android.sh6
1 files changed, 2 insertions, 4 deletions
diff --git a/ci/build_android.sh b/ci/build_android.sh
index 8925593e..9977402d 100644
--- a/ci/build_android.sh
+++ b/ci/build_android.sh
@@ -9,12 +9,10 @@ export START_PATH=~/
export SOURCE_PATH=$START_PATH"/"${CIRCLE_PROJECT_REPONAME}"/"
export CMAKE_FILE=$SOURCE_PATH"/Toolchain/arm-eabi.cmake"
-export NDK_SUFFIX="r10d"
-export ANDROID_NDK=$ANDROID_HOME"/android-ndk-"$NDK_SUFFIX
+export ANDROID_NDK="/usr/local/android-ndk/"
export ANDROID_NDK_BIN=$ANDROID_NDK"/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/bin"
-export ANDROID_SDK=$ANDROID_HOME"/android-sdk-linux"
-export ANDROID_SDK_TOOLS=$ANDROID_SDK"/tools"
+export ANDROID_SDK="/usr/local/android-sdk-linux/"
export ANDROID_SDK_PLATFORM_TOOLS=$ANDROID_SDK"/platform-tools"
export ANDROID_TOOLS_CHECK=$ANDROID_SDK"/tools"