Skip to content

Commit

Permalink
android: find makedepend
Browse files Browse the repository at this point in the history
For some reason the Android CI build started failing with:
    makedepend: not found
when building OpenSSL.

Add it to the YAML, but also try to 'apt-get install' it
if it's still missing.

Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
  • Loading branch information
neolit123 committed Apr 30, 2018
1 parent 0ac2a30 commit 1d7c19f
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 0 deletions.
7 changes: 7 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,21 @@ matrix:
# For SmartTrak import
- libglib2.0-dev
- mdbtools-dev
# For makedepend
- xutils-dev

- env: SUBSURFACE_PLATFORM="android"
# Currently hard coded to arm
os: linux
language: c++
filter_secrets: false
sudo: required
services:
- docker
addons:
apt:
packages:
- xutils-dev
# TODO: caching
# cache:
# timeout: 300
Expand Down
5 changes: 5 additions & 0 deletions packaging/android/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,11 @@ else
export JAVA_HOME=/usr
fi

# find makedepend
if [ ! -e /usr/bin/makedepend ] ; then
sudo apt-get install xutils-dev
fi
ls -l /usr/bin/makedepend

# find qmake
QMAKE=$QT5_ANDROID/android_armv7/bin/qmake
Expand Down

0 comments on commit 1d7c19f

Please sign in to comment.