From 73f9319b923f5f1f119b368f6b08e181c7cf3e7c Mon Sep 17 00:00:00 2001 From: xawotihs Date: Mon, 25 Nov 2013 05:27:31 +0100 Subject: [PATCH 1/5] 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 From 9889186eab09450ba069f18c6dd8991845930b60 Mon Sep 17 00:00:00 2001 From: Dmitry Panin Date: Mon, 25 Nov 2013 13:41:29 +0400 Subject: [PATCH 2/5] Added missing "echo" statement --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2e4b93d3a..5fee256d5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,5 +11,5 @@ install: - 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 + - echo yes | $ANDROID update sdk --filter 1,2,3,8 --no-ui --force > log.txt script: "./travis-script.sh" From fac44c4b48361b8f63f21e8fcb8f3dfa57d41106 Mon Sep 17 00:00:00 2001 From: Rolzad73 Date: Mon, 25 Nov 2013 11:53:34 -0500 Subject: [PATCH 3/5] - updated AndroidManifest.xml to match desired API values. - removed CardEffect.cpp reference from Android.mk build file. - added sdk.buildtools=18.1.1 line to default.properties and project.properties - updated .gitignore --- projects/mtg/Android/.gitignore | 1 + projects/mtg/Android/AndroidManifest.xml | 2 +- projects/mtg/Android/default.properties | 4 ++++ projects/mtg/Android/jni/Android.mk | 1 - projects/mtg/Android/project.properties | 4 ++++ 5 files changed, 10 insertions(+), 2 deletions(-) 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/default.properties b/projects/mtg/Android/default.properties index 8010039f3..3f05ff78e 100644 --- a/projects/mtg/Android/default.properties +++ b/projects/mtg/Android/default.properties @@ -9,3 +9,7 @@ # Project target. target=android-10 + +# Project build tools version +sdk.buildtools=18.1.1 + 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/projects/mtg/Android/project.properties b/projects/mtg/Android/project.properties index b7c2081d5..15f4d07e4 100644 --- a/projects/mtg/Android/project.properties +++ b/projects/mtg/Android/project.properties @@ -12,3 +12,7 @@ # Project target. target=android-10 + +# Build tools version +sdk.buildtools=18.1.1 + From 8aa0b8cea0aba2622ba1ef8c73a698071295b5ee Mon Sep 17 00:00:00 2001 From: Rolzad73 Date: Mon, 25 Nov 2013 13:41:07 -0500 Subject: [PATCH 4/5] reverting sdk.buildtools change --- projects/mtg/Android/default.properties | 4 ---- projects/mtg/Android/project.properties | 4 ---- 2 files changed, 8 deletions(-) diff --git a/projects/mtg/Android/default.properties b/projects/mtg/Android/default.properties index 3f05ff78e..8010039f3 100644 --- a/projects/mtg/Android/default.properties +++ b/projects/mtg/Android/default.properties @@ -9,7 +9,3 @@ # Project target. target=android-10 - -# Project build tools version -sdk.buildtools=18.1.1 - diff --git a/projects/mtg/Android/project.properties b/projects/mtg/Android/project.properties index 15f4d07e4..b7c2081d5 100644 --- a/projects/mtg/Android/project.properties +++ b/projects/mtg/Android/project.properties @@ -12,7 +12,3 @@ # Project target. target=android-10 - -# Build tools version -sdk.buildtools=18.1.1 - From 47685f4892d3411966a09f53e86999f887c56179 Mon Sep 17 00:00:00 2001 From: xawotihs Date: Mon, 25 Nov 2013 22:42:09 +0100 Subject: [PATCH 5/5] Added installation of 32 bits libs to make Android SDK work. --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 5fee256d5..9430365de 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,8 @@ before_install: - 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