From 3a4d5beabdb90747110c930ea57863a329523fce Mon Sep 17 00:00:00 2001 From: mittorn Date: Thu, 24 Nov 2016 13:14:47 +0000 Subject: [PATCH] AAPT has written by monkeys! --- .travis.yml | 10 +++++----- build.xml | 2 -- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index d59ddbc4..93e9c449 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,21 +23,21 @@ script: - sh gen-config.sh test - python2 makepak.py xash-extras assets/extras.pak - ndk-build NDK_TOOLCHAIN_VERSION=4.8 SUPPORT_WEBP=false -j2 APP_CFLAGS="-w" APP_ABI="armeabi-v7a-hard" - - ant debug -Dtest.version=travis + - ant debug -Dtest.version - cp bin/xashdroid-debug.apk xashdroid-armv7.apk - ndk-build NDK_TOOLCHAIN_VERSION=4.8 SUPPORT_WEBP=false -j2 APP_CFLAGS="-w" APP_ABI="armeabi" - - ant debug -Dtest.version=travis + - ant debug -Dtest.version - cp bin/xashdroid-debug.apk xashdroid-armv6.apk - ndk-build NDK_TOOLCHAIN_VERSION=4.8 SUPPORT_WEBP=false -j2 APP_CFLAGS="-w" APP_ABI="x86" - - ant debug -Dtest.version=travis + - ant debug -Dtest.version - cp bin/xashdroid-debug.apk xashdroid-x86.apk - ndk-build NDK_TOOLCHAIN_VERSION=4.8 clean - ndk-build NDK_TOOLCHAIN_VERSION=4.8 -j2 APP_CFLAGS="-w" APP_ABI="armeabi-v7a-hard" CFLAGS_OPT_ARM="-mthumb -mfpu=vfpv3-d16 -mcpu=cortex-a9 -pipe -fPIC" - - ant debug -Dtest.version=travis + - ant debug -Dtest.version - cp bin/xashdroid-debug.apk xashdroid-armv7-tegra2.apk - ndk-build NDK_TOOLCHAIN_VERSION=4.8 clean - ndk-build NDK_TOOLCHAIN_VERSION=4.8 -j2 APP_CFLAGS="-w" APP_ABI="armeabi" CFLAGS_OPT_ARMv5="-marm -march=armv5te -msoft-float -fPIC" - - ant debug -Dtest.version=travis + - ant debug -Dtest.version - cp bin/xashdroid-debug.apk xashdroid-armv5.apk diff --git a/build.xml b/build.xml index 29deb15a..ed6ba05d 100644 --- a/build.xml +++ b/build.xml @@ -89,8 +89,6 @@ declared in default.properties. - -