From 46a9d3fac6923ff5b41eee88773bae94cbd09d30 Mon Sep 17 00:00:00 2001 From: mittorn Date: Fri, 6 May 2016 15:12:19 +0000 Subject: [PATCH] Update travis --- .travis.yml | 14 +++++++------- AndroidManifest.xml | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6e5ac9bb..9fca1f7c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,21 +21,21 @@ before_install: script: - sh gen-version.sh travis build - python2 makepak.py xash-extras assets/extras.pak - - ndk-build NDK_TOOLCHAIN_VERSION=4.8 XASH_SDL=1 SUPPORT_WEBP=false -j2 APP_CFLAGS="-w" APP_ABI="armeabi-v7a-hard" + - ndk-build NDK_TOOLCHAIN_VERSION=4.8 SUPPORT_WEBP=false -j2 APP_CFLAGS="-w" APP_ABI="armeabi-v7a-hard" - ant debug - cp bin/xashdroid-debug.apk xashdroid-armv7.apk - - ndk-build NDK_TOOLCHAIN_VERSION=4.8 XASH_SDL=1 SUPPORT_WEBP=false -j2 APP_CFLAGS="-w" APP_ABI="armeabi" + - ndk-build NDK_TOOLCHAIN_VERSION=4.8 SUPPORT_WEBP=false -j2 APP_CFLAGS="-w" APP_ABI="armeabi" - ant debug - cp bin/xashdroid-debug.apk xashdroid-armv6.apk - - ndk-build NDK_TOOLCHAIN_VERSION=4.8 XASH_SDL=1 SUPPORT_WEBP=false -j2 APP_CFLAGS="-w" APP_ABI="x86" + - ndk-build NDK_TOOLCHAIN_VERSION=4.8 SUPPORT_WEBP=false -j2 APP_CFLAGS="-w" APP_ABI="x86" - ant debug - cp bin/xashdroid-debug.apk xashdroid-x86.apk - - ndk-build NDK_TOOLCHAIN_VERSION=4.8 XASH_SDL=1 clean - - ndk-build NDK_TOOLCHAIN_VERSION=4.8 XASH_SDL=1 -j2 APP_CFLAGS="-w" APP_ABI="armeabi-v7a-hard" CFLAGS_OPT_ARM="-mthumb -mfpu=vfpv3-d16 -mcpu=cortex-a9 -pipe -fPIC" + - 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 - cp bin/xashdroid-debug.apk xashdroid-armv7-tegra2.apk - - ndk-build NDK_TOOLCHAIN_VERSION=4.8 XASH_SDL=1 clean - - ndk-build NDK_TOOLCHAIN_VERSION=4.8 XASH_SDL=1 -j2 APP_CFLAGS="-w" APP_ABI="armeabi" CFLAGS_OPT_ARMv5="-marm -march=armv5te -msoft-float -fPIC" + - 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 - cp bin/xashdroid-debug.apk xashdroid-armv5.apk diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 23539bc9..64e91839 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -90,7 +90,7 @@ - +