Skip to content

Q
qgroundcontrol
Commit b147b549 authored by Don Gagne's avatar Don Gagne
Browse files
Options

parent b45b8530
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
.travis.yml
View file @ b147b549
...@@ -28,12 +28,12 @@ matrix: ...@@ -28,12 +28,12 @@ matrix:
- name: "Android 32 bit" - name: "Android 32 bit"
dist: trusty dist: trusty
language: android language: android
env: SPEC=android-clang CONFIG=installer BITNESS=32 env: SPEC=android-clang CONFIG=installer BITNESS=32 GSTREAMER_NAME=armv7
sudo: false sudo: false
- name: "Android 64 bit" - name: "Android 64 bit"
dist: trusty dist: trusty
language: android language: android
env: SPEC=android-clang CONFIG=installer BITNESS=64 env: SPEC=android-clang CONFIG=installer BITNESS=64 GSTREAMER_NAME=arm64
sudo: false sudo: false
- name: "OSX Installer" - name: "OSX Installer"
os: osx os: osx
...@@ -96,7 +96,7 @@ install: ...@@ -96,7 +96,7 @@ install:
# android dependencies: qt, gstreamer, android-ndk # android dependencies: qt, gstreamer, android-ndk
- if [ "${SPEC}" = "android-clang" ]; then - 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} && 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 && 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 && unzip android-ndk-r20-linux-x86_64.zip > /dev/null &&
......
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