Skip to content

Q
qgroundcontrol
Unverified Commit 806b2f1b authored by Don Gagne's avatar Don Gagne Committed by GitHub
Browse files
Options

Merge pull request #8339 from DonLakeFlyer/AndroidGStreamer 

Use new tarballs for android gstreamer
parents c976e144 5ab64979
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
.travis.yml
View file @ 806b2f1b
......@@ -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 &&
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment