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.

Try to 'apt-get install' it in android-build-wrapper.sh.

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

- env: SUBSURFACE_PLATFORM="android"
# Currently hard coded to arm
os: linux
dist: trusty
sudo: required
language: c++
filter_secrets: false
services:
Expand Down
7 changes: 7 additions & 0 deletions packaging/android/android-build-wrapper.sh
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,13 @@ else
exit 1
fi

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

# make sure we have the required commands installed
MISSING=
for i in git cmake autoconf libtool java ant wget unzip; do
Expand Down
1 change: 0 additions & 1 deletion packaging/android/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,6 @@ else
export JAVA_HOME=/usr
fi


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

0 comments on commit fcfaac8

Please sign in to comment.