Browse Source

Merge pull request #7890 from DonLakeFlyer/AndroidSDL

Remove SDL from android image
QGC4.4
Don Gagne 5 years ago committed by GitHub
parent
commit
1d3a34b78e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 6
      .travis.yml

6
.travis.yml

@ -64,7 +64,6 @@ addons:
- libgstreamer-plugins-base1.0-dev - libgstreamer-plugins-base1.0-dev
- libgstreamer1.0-0:amd64 - libgstreamer1.0-0:amd64
- libgstreamer1.0-dev - libgstreamer1.0-dev
- libsdl2-dev
- libudev-dev - libudev-dev
- wget - wget
@ -81,6 +80,11 @@ before_install:
export JOBS=$((`sysctl -n hw.ncpu`+1)); export JOBS=$((`sysctl -n hw.ncpu`+1));
fi fi
# Linux needs sdl2 but not android
- if [ "${SPEC}" = "linux-g++-64" ]; then
sudo apt-get install -y libsdl2-dev;
fi
install: install:
# linux dependencies: qt # linux dependencies: qt
- if [ "${SPEC}" = "linux-g++-64" ]; then - if [ "${SPEC}" = "linux-g++-64" ]; then

Loading…
Cancel
Save