diff --git a/.travis.yml b/.travis.yml index 7b8b40a544c6f8f5bc91d6397204fd4e7ffae7a6..edc1f1979f5c5570aadb466757792611b7d9550f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,12 +28,12 @@ matrix: - name: "Android 32 bit" dist: trusty language: android - env: SPEC=android-clang CONFIG=installer BITNESS=32 + env: SPEC=android-clang CONFIG=installer BITNESS=32 GSTREAMER_NAME=armv7 sudo: false - name: "Android 64 bit" dist: trusty language: android - env: SPEC=android-clang CONFIG=installer BITNESS=64 + env: SPEC=android-clang CONFIG=installer BITNESS=64 GSTREAMER_NAME=arm64 sudo: false - name: "OSX Installer" os: osx @@ -96,8 +96,8 @@ install: # android dependencies: qt, gstreamer, android-ndk - if [ "${SPEC}" = "android-clang" ]; then - wget --quiet https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/gstreamer-1.0-android-universal-1.14.4.tar.bz2 && - tar jxf gstreamer-1.0-android-universal-1.14.4.tar.bz2 -C ${TRAVIS_BUILD_DIR} && + wget --quiet https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/gstreamer-1.0-android-${GSTREAMER_NAME}-1.14.4.tar.bz2 && + tar jxf gstreamer-1.0-android-${GSTREAMER_NAME}-1.14.4.tar.bz2 -C ${TRAVIS_BUILD_DIR} && wget --quiet https://dl.google.com/android/repository/android-ndk-r20-linux-x86_64.zip && unzip android-ndk-r20-linux-x86_64.zip > /dev/null && export ANDROID_NDK_ROOT=`pwd`/android-ndk-r20 &&