diff options
| author | Pierre Grandin <grandinp@altern.org> | 2016-11-30 02:40:51 +0000 |
|---|---|---|
| committer | Pierre Grandin <grandinp@altern.org> | 2016-11-30 02:40:51 +0000 |
| commit | 6ee5e17b2523b49be9254827e98e46564d938342 (patch) | |
| tree | ad991f809b4de2a33a753a8201597aa19abe7dd9 | |
| parent | a889d7c53d612d1762d5f896cfd232db2036dcc3 (diff) | |
| download | navit-6ee5e17b2523b49be9254827e98e46564d938342.tar.gz | |
Install ndk only when needed
| -rw-r--r-- | ci/build_android.sh | 3 | ||||
| -rw-r--r-- | circle.yml | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/ci/build_android.sh b/ci/build_android.sh index 5c3542b25..650c9808e 100644 --- a/ci/build_android.sh +++ b/ci/build_android.sh @@ -4,6 +4,9 @@ grn='\e[0;32m' yel='\e[1;33m' off='\e[0m' +wget -nv -c wget http://dl.google.com/android/repository/android-ndk-r13-linux-x86_64.zip +unzip -d ~ android-ndk-r13-linux-x86_64.zip + # setup var's to perform environment setup and cmake export START_PATH=~/ export SOURCE_PATH=$START_PATH"/"${CIRCLE_PROJECT_REPONAME}"/" diff --git a/circle.yml b/circle.yml index ac710bd43..5a020f455 100644 --- a/circle.yml +++ b/circle.yml @@ -23,10 +23,6 @@ dependencies: # for aapt - sudo apt-get install lib32stdc++6 - sudo apt-get install lib32z1 - - wget http://dl.google.com/android/repository/android-ndk-r13-linux-x86_64.zip && unzip -d ~ android-ndk-r13-linux-x86_64.zip -# Windows build - - sudo apt-get install mingw32 mingw32-binutils mingw32-runtime - - sudo apt-get install default-jdk nsis # For python testing with junit reporting - sudo apt-get install python-gobject libdbus-glib-1-dev python-dev - sudo pip install junit-xml dbus-python |