From b3d580cada80129ee3c25d1a17ec016c105226eb Mon Sep 17 00:00:00 2001 From: xawotihs Date: Tue, 19 Jul 2016 21:03:24 +0100 Subject: [PATCH 1/3] Changed Android app manifest to be not debuggable. --- projects/mtg/Android/AndroidManifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/mtg/Android/AndroidManifest.xml b/projects/mtg/Android/AndroidManifest.xml index a51c2a6e2..3a4255c1c 100644 --- a/projects/mtg/Android/AndroidManifest.xml +++ b/projects/mtg/Android/AndroidManifest.xml @@ -4,7 +4,7 @@ - + From 775085eca1d57de35e76db75b19b80cb99719d8e Mon Sep 17 00:00:00 2001 From: Xawotihs Date: Tue, 19 Jul 2016 21:30:08 +0100 Subject: [PATCH 2/3] Uses now *ant release* to build the APK --- tools/travis-script.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/travis-script.sh b/tools/travis-script.sh index 01fa2ec0e..d39f204e3 100755 --- a/tools/travis-script.sh +++ b/tools/travis-script.sh @@ -62,7 +62,7 @@ if [ "$BUILD_ANDROID" = "YES" ]; then android-ndk-r9/ndk-build -C projects/mtg/Android -j4 $ANDROID list targets $ANDROID update project -t 1 -p projects/mtg/Android - ant debug -f projects/mtg/Android/build.xml + ant release -f projects/mtg/Android/build.xml fi # we're building a Qt version with GUI here From a6211e371e668c938447c6189f222bc0fb92550c Mon Sep 17 00:00:00 2001 From: xawotihs Date: Tue, 19 Jul 2016 22:24:26 +0100 Subject: [PATCH 3/3] Revert usage of ant release and remove the DEBUG define in the NDK makefile to remove the testsuite --- projects/mtg/Android/jni/Android.mk | 3 +-- tools/travis-script.sh | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/projects/mtg/Android/jni/Android.mk b/projects/mtg/Android/jni/Android.mk index 563b80b63..9647f0a36 100644 --- a/projects/mtg/Android/jni/Android.mk +++ b/projects/mtg/Android/jni/Android.mk @@ -11,9 +11,8 @@ SDL_PATH := $(JGE_PATH)/Dependencies/SDL BOOST_PATH := $(MY_WAGIC_ROOT)/Boost JPEG_PATH := $(JGE_PATH)/Dependencies/libjpeg PNG_PATH := $(JGE_PATH)/Dependencies/libpng -DEBUG ?= DEBUG -LOCAL_CFLAGS += -DLINUX -DANDROID -DSDL_CONFIG -D_$(DEBUG) +LOCAL_CFLAGS += -DLINUX -DANDROID -DSDL_CONFIG LOCAL_CFLAGS += -D_STLP_USE_SIMPLE_NODE_ALLOC -DTIXML_USE_STL LOCAL_CFLAGS += -D__arm__ -D_REENTRANT -D_GLIBCXX__PTHREADS LOCAL_STATIC_LIBRARIES := libpng libjpeg diff --git a/tools/travis-script.sh b/tools/travis-script.sh index d39f204e3..01fa2ec0e 100755 --- a/tools/travis-script.sh +++ b/tools/travis-script.sh @@ -62,7 +62,7 @@ if [ "$BUILD_ANDROID" = "YES" ]; then android-ndk-r9/ndk-build -C projects/mtg/Android -j4 $ANDROID list targets $ANDROID update project -t 1 -p projects/mtg/Android - ant release -f projects/mtg/Android/build.xml + ant debug -f projects/mtg/Android/build.xml fi # we're building a Qt version with GUI here