diff options
| author | kazer_ <kazer_@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2015-07-31 22:03:41 +0000 |
|---|---|---|
| committer | kazer_ <kazer_@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2015-07-31 22:03:41 +0000 |
| commit | d693160815dfb374d802e1359932c64635316732 (patch) | |
| tree | 4476d9d7035ce334d3593f905a9178c346c85f6e | |
| parent | d88f4060a402b2851cd82dc1f43639f91df47a19 (diff) | |
| download | navit-svn-d693160815dfb374d802e1359932c64635316732.tar.gz | |
Update:Android:Set the svn revision from build_android.sh
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@6131 ffa7fe5e-494d-0410-b361-a75ebd5db220
| -rw-r--r-- | ci/build_android.sh | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ci/build_android.sh b/ci/build_android.sh index 3d832b09..0d482fab 100644 --- a/ci/build_android.sh +++ b/ci/build_android.sh @@ -130,6 +130,10 @@ mkdir -p $BUILD_PATH cd $BUILD_PATH export PATH=$ANDROID_NDK_BIN:$ANDROID_SDK_TOOLS:$ANDROID_SDK_PLATFORM_TOOLS:$PATH android list targets +svn_rev=` cd ~/navit/; git log -1|grep svn|cut -c 65-68` +sed -i -e "s/ANDROID_VERSION_INT=\"0\"/ANDROID_VERSION_INT=\"${svn_rev}\"/g" ~/navit/navit/android/CMakeLists.txt +cp ~/navit/navit/android/CMakeLists.txt $CIRCLE_ARTIFACTS/ + cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_FILE -DCACHE_SIZE='(20*1024*1024)' -DAVOID_FLOAT=1 -DANDROID_API_VERSION=19 $SOURCE_PATH make || exit 1 if [[ "${CIRCLE_BRANCH}" == "master" ]]; then |