Merge pull request #19 from navit-gps/circle.yml-update

Circle.yml update

ci/build.sh

@@ -2,7 +2,7 @@ tar xfz ~/assets/cov-analysis-linux64-7.6.0.tar.gz
 export PATH=~/navit/cov-analysis-linux64-7.6.0/bin:$PATH
 
 mkdir bin && cd bin
-cov-build --dir cov-int cmake ../ -DSAMPLE_MAP=n -Dgraphics/qt_qpainter:BOOL=FALSE -Dgui/qml:BOOL=FALSE
+cov-build --dir cov-int cmake ../ -Dgraphics/qt_qpainter:BOOL=FALSE -Dgui/qml:BOOL=FALSE
 cov-build --dir cov-int make || exit -1
 tar czvf navit.tgz cov-int
 

circle.yml

@@ -3,7 +3,7 @@ machine:
     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.3.3-linux.tgz
+    ANDROID_SDK_FILE: android-sdk_r24.3.4-linux.tgz
     ANDROID_NDK_CDN: http://dl.google.com/android/ndk
     ANDROID_NDK_FILE: android-ndk-r10e-linux-x86_64.bin
     CMAKE_FILE: ../Toolchain/arm-eabi.cmake
@@ -18,8 +18,8 @@ dependencies:
     - wget -c -O ~/assets/cov-analysis-linux64-7.6.0.tar.gz http://sd-55475.dedibox.fr/cov-analysis-linux64-7.6.0.tar.gz
     - sudo apt-get update
     - sudo apt-get install cmake
-    - sudo apt-get install libpng12-dev 
-    - sudo apt-get install libgtk2.0-dev 
+    - sudo apt-get install libpng12-dev
+#    - sudo apt-get install libgtk2.0-dev 
     - sudo apt-get install librsvg2-bin 
     - sudo apt-get install libfreetype6-dev
     - sudo apt-get install libdbus-glib-1-dev
@@ -33,7 +33,7 @@ dependencies:
     - 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 gettext
-    - sudo apt-get install openjdk-7-jdk
+    - sudo apt-get install openjdk-8-jdk
     - sudo apt-get install ant
     - sudo apt-get install libsaxonb-java
 # for aapt