ndk+ci: Upgrade to use CrystaX NDK 10.3.1 and a more recent version of Crypto++ library
This commit also fixes checks with Travis-CI that were effectively broken before.
Change-Id: Ibf9e54de47db00ed01534187a19a3d40e9dee84e
diff --git a/.travis.yml b/.travis.yml
index f36664f..cee130e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,18 +1,5 @@
-language: android
-android:
- components:
- - platform-tools
- - build-tools-21.1.2
- - android-19
- - android-21
- - extra-android-support
- - extra-android-m2repository
- - extra-google-m2repository
- # - tools
- # - extra
- # - extra-google-google_play_services
- # - addon-google_apis-google-19
- # - sys-img-armeabi-v7a-android-19
+sudo: false
+language: generic
jdk:
- openjdk7
notifications:
@@ -26,9 +13,27 @@
- NDK_BUILD_ABI=mips
- NDK_BUILD_ABI=x86
- NDK_BUILD_ABI=x86_64
+addons:
+ apt:
+ packages:
+ - lib32stdc++6
+ - lib32z1
+ - lib32z1-dev
+ - build-essential
+ - wget
+ - unzip
before_install:
- - travis_retry sudo apt-get update -qq
- - travis_retry sudo apt-get install -y build-essential unzip wget pv
+ - wget https://www.ivarch.com/programs/sources/pv-1.6.0.tar.bz2
+ - tar xjf pv-1.6.0.tar.bz2
+ - cd pv-1.6.0
+ - ./configure --prefix=$HOME --disable-nls
+ - make install
+ - cd ..
+ - rm pv-1.6.0.tar.bz2
+ - export PATH=$HOME/bin:$PATH
+ - travis_retry .jenkins.d/10-get-sdk.sh
- travis_retry .jenkins.d/10-get-ndk.sh
script:
- - GRADLE_OPTS="-Xmx768m -Xms256m -Xss1m" NDK_BUILD_PARALLEL=1 gradle assembleRelease
+ - git submodule update --init --recursive
+ - ./gradle --version
+ - GRADLE_OPTS="-Xmx768m -Xms256m -Xss1m" NDK_BUILD_PARALLEL=1 ./gradle assembleDebug --console plain