diff --git a/.travis.yml b/.travis.yml index 9b983bb..5ccd5b1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -44,16 +44,10 @@ matrix: sudo: required android: components: - - tools - tools - platform-tools - - build-tools-27.0.3 - - android-27 - extra-google-m2repository - extra-android-m2repository - licenses: - - 'android-sdk-preview-license-.+' - - 'android-sdk-license-.+' - language: android name: "Android 5.x" env: ARCH=android MIN_NAL=21 MAX_NAL=22 @@ -61,16 +55,10 @@ matrix: sudo: required android: components: - - tools - tools - platform-tools - - build-tools-27.0.3 - - android-27 - extra-google-m2repository - extra-android-m2repository - licenses: - - 'android-sdk-preview-license-.+' - - 'android-sdk-license-.+' - language: android name: "Android 6.x 7.x" env: ARCH=android MIN_NAL=23 MAX_NAL=25 @@ -78,16 +66,10 @@ matrix: sudo: required android: components: - - tools - tools - platform-tools - - build-tools-27.0.3 - - android-27 - extra-google-m2repository - extra-android-m2repository - licenses: - - 'android-sdk-preview-license-.+' - - 'android-sdk-license-.+' - language: android name: "Android 8.x" env: ARCH=android MIN_NAL=26 MAX_NAL=27 @@ -95,33 +77,21 @@ matrix: sudo: required android: components: - - tools - tools - platform-tools - - build-tools-27.0.3 - - android-27 - extra-google-m2repository - extra-android-m2repository - licenses: - - 'android-sdk-preview-license-.+' - - 'android-sdk-license-.+' - language: android - name: "Android 9.x" - env: ARCH=android MIN_NAL=28 MAX_NAL=28 + name: "Android 9.x 10.x" + env: ARCH=android MIN_NAL=28 MAX_NAL=29 dist: trusty sudo: required android: components: - - tools - tools - platform-tools - - build-tools-27.0.3 - - android-27 - extra-google-m2repository - extra-android-m2repository - licenses: - - 'android-sdk-preview-license-.+' - - 'android-sdk-license-.+' script: "./scripts/travis" diff --git a/scripts/travis b/scripts/travis index 3e794e7..88e40eb 100755 --- a/scripts/travis +++ b/scripts/travis @@ -97,11 +97,10 @@ elif [ "x$ARCH" = "xarm32" -o "x$ARCH" = "xarm64" ]; then file apps/openssl/.libs/openssl elif [ "x$ARCH" = "xandroid" ]; then + touch $HOME/.android/repositories.cfg echo y | sdkmanager 'ndk-bundle' + echo y | sdkmanager 'ndk;20.1.5948944' echo y | sdkmanager 'cmake;3.6.4111459' - echo y | sdkmanager 'lldb;3.0' - echo y | sdkmanager --update - echo y | sdkmanager --licenses export CMAKE=$ANDROID_HOME/cmake/3.6.4111459/bin/cmake export NINJA=$ANDROID_HOME/cmake/3.6.4111459/bin/ninja