summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjandegr <jandegr@users.noreply.github.com>2015-08-24 09:14:04 +0200
committerjandegr <jandegr@users.noreply.github.com>2015-08-24 09:14:04 +0200
commit8e5cebc3a701b1f25cdc8bd331ef9c2d53dc6b2f (patch)
treed254b2c10dbc86e5aaa1bae71271129f6d4a3c93
parent8a2589dee6175717d693cc494039767f14daea2e (diff)
downloadnavit-8e5cebc3a701b1f25cdc8bd331ef9c2d53dc6b2f.tar.gz
Update circle.yml
-rw-r--r--circle.yml8
1 files changed, 4 insertions, 4 deletions
diff --git a/circle.yml b/circle.yml
index 31d78294b..741864643 100644
--- a/circle.yml
+++ b/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