Revert usage of ant release and remove the DEBUG define in the NDK ma…

…kefile to remove the testsuite
WagicProject · Jul 19, 2016 · a6211e3 · a6211e3
1 parent 775085e
commit a6211e3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git 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
@@ -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