summaryrefslogtreecommitdiff
path: root/circle.yml
diff options
context:
space:
mode:
authorkazer_ <kazer_@ffa7fe5e-494d-0410-b361-a75ebd5db220>2015-04-08 19:07:19 +0000
committerkazer_ <kazer_@ffa7fe5e-494d-0410-b361-a75ebd5db220>2015-04-08 19:07:19 +0000
commit75fd4c09428336c4aa54c36ccfe903b46fd5952f (patch)
tree3caa901cae1b903d74a71fd32fd0ac785008da4e /circle.yml
parent358812af2c27c4abe324beb205e6d156b96fb1ea (diff)
downloadnavit-svn-75fd4c09428336c4aa54c36ccfe903b46fd5952f.tar.gz
Update:CI:Importing Jan's settings for android build
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@6067 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'circle.yml')
-rw-r--r--circle.yml16
1 files changed, 8 insertions, 8 deletions
diff --git a/circle.yml b/circle.yml
index 72b00e2c..2465ac3d 100644
--- a/circle.yml
+++ b/circle.yml
@@ -1,11 +1,11 @@
machine:
environment:
- #ANDROID_HOME: /home/ubuntu/android
- #ANDROID_NDK_HOME: /home/ubuntu/android/android-ndk
- #ANDROID_SDK_CDN: https://dl.google.com/android
- #ANDROID_SDK_FILE: android-sdk_r24.0.2-linux.tgz
- #ANDROID_NDK_CDN: http://dl.google.com/android/ndk
- #ANDROID_NDK_FILE: android-ndk-r10d-linux-x86_64.bin
+ ANDROID_HOME: /home/ubuntu/android
+ ANDROID_NDK_HOME: /home/ubuntu/android/android-ndk
+ ANDROID_SDK_CDN: https://dl.google.com/android
+ ANDROID_SDK_FILE: android-sdk_r24.0.2-linux.tgz
+ ANDROID_NDK_CDN: http://dl.google.com/android/ndk
+ ANDROID_NDK_FILE: android-ndk-r10d-linux-x86_64.bin
CMAKE_FILE: ../Toolchain/arm-eabi.cmake
dependencies:
cache_directories:
@@ -28,8 +28,8 @@ dependencies:
- cp bin/po/navit.pot $CIRCLE_ARTIFACTS/
- "curl 'https://translations.launchpad.net/navit/trunk/+translations-upload' -H \"$lp_cookie\" -H 'Referer: https://translations.launchpad.net/navit/trunk/+translations-upload' -F file=@bin/po/navit.pot"
# Android build
- # - wget -c -N -q $ANDROID_SDK_CDN/$ANDROID_SDK_FILE -O $ANDROID_HOME/$ANDROID_SDK_FILE
- # - wget -c -N -q $ANDROID_NDK_CDN/$ANDROID_NDK_FILE -O $ANDROID_HOME/$ANDROID_NDK_FILE
+ - wget -c -N -q $ANDROID_SDK_CDN/$ANDROID_SDK_FILE -O $ANDROID_HOME/$ANDROID_SDK_FILE
+ - wget -c -N -q $ANDROID_NDK_CDN/$ANDROID_NDK_FILE -O $ANDROID_HOME/$ANDROID_NDK_FILE
- sudo apt-get install gpsd
- sudo apt-get install gpsd-clients
- sudo apt-get install libgps-dev