diff options
| author | Michael Dankov <tryagain@navit-project.org> | 2016-01-02 21:39:32 +0300 |
|---|---|---|
| committer | Michael Dankov <tryagain@navit-project.org> | 2016-01-02 21:39:32 +0300 |
| commit | 8f453447bce25ab184378980d43d731f2a8f1685 (patch) | |
| tree | 5bba03e334c67fe0b6e552b7dc00af50d7c0ce09 | |
| parent | e356b96df3f6810e4b3943a3c6402c6efb801a36 (diff) | |
| download | navit-R6499.tar.gz | |
Fix:build:Fetch android app version from tags.R6499
Use value queried by cmake/version.cmake for circle ci builds instead
of guessing it from circleci environment variables, which are properly set
only for navit-gps organization builds.
Related to #1336.
| -rw-r--r-- | ci/build_android.sh | 3 | ||||
| -rw-r--r-- | navit/android/CMakeLists.txt | 1 |
2 files changed, 0 insertions, 4 deletions
diff --git a/ci/build_android.sh b/ci/build_android.sh index 553a1aaf1..6525541ba 100644 --- a/ci/build_android.sh +++ b/ci/build_android.sh @@ -43,9 +43,6 @@ mkdir -p $BUILD_PATH cd $BUILD_PATH export PATH=$ANDROID_NDK_BIN:$ANDROID_SDK_TOOLS:$ANDROID_SDK_PLATFORM_TOOLS:$PATH android list targets -# The value comes from ( last_svn_rev - max_build_id ) at the time of the git migration -svn_rev=$(( 5658 + $CIRCLE_BUILD_NUM )) -sed -i -e "s/ANDROID_VERSION_INT=\"0\"/ANDROID_VERSION_INT=\"${svn_rev}\"/g" ~/navit/navit/android/CMakeLists.txt mkdir $CIRCLE_ARTIFACTS/android/ cp ~/navit/navit/android/CMakeLists.txt $CIRCLE_ARTIFACTS/android/ diff --git a/navit/android/CMakeLists.txt b/navit/android/CMakeLists.txt index cd842be06..ca3bdbfa4 100644 --- a/navit/android/CMakeLists.txt +++ b/navit/android/CMakeLists.txt @@ -30,7 +30,6 @@ if (ANDROID) DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/AndroidManifest.xml.cmake COMMAND ${CMAKE_COMMAND} -D SRC=${CMAKE_CURRENT_SOURCE_DIR}/AndroidManifest.xml.cmake -D DST=${CMAKE_CURRENT_BINARY_DIR}/AndroidManifest.xml - -D ANDROID_VERSION_INT="0" -D NAME=ANDROID_VERSION_INT -D ANDROID_VERSION_NAME=${PACKAGE_STRING} -D ANDROID_API_VERSION=${ANDROID_API_VERSION} |