Skip to content

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

Merge pull request #7890 from DonLakeFlyer/AndroidSDL 

Remove SDL from android image
parents 5c09454c 7c195e6d
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 1 deletion
.travis.yml
View file @ 1d3a34b7
...@@ -64,7 +64,6 @@ addons: ...@@ -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: ...@@ -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
......
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