From b147b549a4172fcbc60bf799b03deeadaf01f135 Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Sat, 15 Feb 2020 15:13:23 -0800 Subject: [PATCH] User new tarballs for android gstreamer --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 705b8f7b7..af4bc5030 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,7 +96,7 @@ 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 && + 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-universal-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 && -- 2.22.0