diff --git a/.travis.yml b/.travis.yml
index 2b6cf9e36..9430365de 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,15 @@ 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:
+ - sudo apt-get update -qq
+ - if [ `uname -m` = x86_64 ]; then sudo apt-get install -qq --force-yes libgd2-xpm ia32-libs ia32-libs-multiarch; fi
- 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
+ - echo yes | $ANDROID update sdk --filter 1,2,3,8 --no-ui --force > log.txt
script: "./travis-script.sh"
diff --git a/projects/mtg/Android/.gitignore b/projects/mtg/Android/.gitignore
index b2b2f4c62..5a9b113aa 100644
--- a/projects/mtg/Android/.gitignore
+++ b/projects/mtg/Android/.gitignore
@@ -1,2 +1,3 @@
/gen
+/bin
diff --git a/projects/mtg/Android/AndroidManifest.xml b/projects/mtg/Android/AndroidManifest.xml
index 0ed014758..8fd0e2815 100644
--- a/projects/mtg/Android/AndroidManifest.xml
+++ b/projects/mtg/Android/AndroidManifest.xml
@@ -14,5 +14,5 @@
-
+
diff --git a/projects/mtg/Android/jni/Android.mk b/projects/mtg/Android/jni/Android.mk
index da01c8a6d..faa1067b3 100644
--- a/projects/mtg/Android/jni/Android.mk
+++ b/projects/mtg/Android/jni/Android.mk
@@ -41,7 +41,6 @@ LOCAL_SRC_FILES := $(SDL_PATH)/src/main/android/SDL_android_main.cpp \
$(MTG_PATH)/src/AllAbilities.cpp \
$(MTG_PATH)/src/CardDescriptor.cpp \
$(MTG_PATH)/src/CardDisplay.cpp \
- $(MTG_PATH)/src/CardEffect.cpp \
$(MTG_PATH)/src/CardGui.cpp \
$(MTG_PATH)/src/CardPrimitive.cpp \
$(MTG_PATH)/src/CardSelector.cpp \
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