From 73f9319b923f5f1f119b368f6b08e181c7cf3e7c Mon Sep 17 00:00:00 2001 From: xawotihs Date: Mon, 25 Nov 2013 05:27:31 +0100 Subject: [PATCH] Activates Android build from Travis --- .travis.yml | 6 ++++++ travis-script.sh | 8 +++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2b6cf9e36..2e4b93d3a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,13 @@ before_install: - export PSPDEV="$TRAVIS_BUILD_DIR/opt/pspsdk" - export PSPSDK="$PSPDEV/psp/sdk" - export PATH="$PATH:$PSPDEV/bin:$PSPSDK/bin" + - export ANDROID="android-sdk-linux/tools/android" install: - wget -O sdk.lzma http://sourceforge.net/projects/minpspw/files/SDK%20%2B%20devpak/pspsdk%200.11.2/minpspw_0.11.2-amd64.tar.lzma/download - tar -x --xz -f sdk.lzma + - wget http://dl.google.com/android/ndk/android-ndk-r9-linux-x86_64.tar.bz2 -nv + - wget http://dl.google.com/android/android-sdk_r22-linux.tgz -nv + - tar --absolute-names -jxf android-ndk-r9-linux-x86_64.tar.bz2 + - tar -zxf android-sdk_r22-linux.tgz + - $ANDROID update sdk --filter 1,2,3,8 --no-ui --force > log.txt script: "./travis-script.sh" diff --git a/travis-script.sh b/travis-script.sh index b9461e8a9..6927f0dc8 100755 --- a/travis-script.sh +++ b/travis-script.sh @@ -7,9 +7,15 @@ cd .. cd projects/mtg mkdir objs make -j 8 +cd ../.. + +# we're building an Android binary here +android-ndk-r9/ndk-build -C projects/mtg/Android -j8 +$ANDROID list targets +$ANDROID update project -t 1 -p projects/mtg/Android +ant debug -f projects/mtg/Android/build.xml # let's try an Intel linux binary -cd ../.. qmake projects/mtg/wagic-qt.pro CONFIG+=console CONFIG+=debug DEFINES+=CAPTURE_STDERR make -j 8