From e759bf819a56e5400ef2bb87fb8997afe384314a Mon Sep 17 00:00:00 2001
From: mittorn <mittorn@sibmail.com>
Date: Wed, 14 Sep 2016 09:16:34 +0000
Subject: [PATCH] Ant travis test build

---
 .travis.yml                          | 23 ++-------------------
 build.xml                            | 30 ++++++++++++++++++++++++++++
 jni/src/Xash3D/xash3d                |  2 +-
 src/in/celest/xash3d/XashConfig.java |  7 +++++++
 4 files changed, 40 insertions(+), 22 deletions(-)
 create mode 100644 src/in/celest/xash3d/XashConfig.java

diff --git a/.travis.yml b/.travis.yml
index b225882c..0d52d899 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,26 +20,7 @@ before_install:
   - git submodule update
 script:
   - sh gen-version.sh travis build
+  - 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
-  - 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
-  - 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
-  - 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
-  - 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
-  - cp bin/xashdroid-debug.apk xashdroid-armv5.apk
-
-
-after_script:
-  - bash scripts/travis-upload.sh
-
+  - cp bin/xashdroid-debug.apk xashdroid-stub.apk
diff --git a/build.xml b/build.xml
index 96cb7ec6..82361728 100644
--- a/build.xml
+++ b/build.xml
@@ -68,6 +68,35 @@
     -->
     <import file="custom_rules.xml" optional="true" />
 
+ <!-- allow the package name to be overridden when building -->
+<property name="override.package.name" value="in.celest.xash3d.hl"/>
+<!-- Puts the project's resources into the output package file
+This actually can create multiple resource package in case
+Some custom apk with specific configuration have been
+declared in default.properties.
+-->
+<!-- Replaces the target in tools\ant\build.xml -->
+<target name="-package-resources" depends="-crunch">
+            <!-- this exec replicates the output of the aapt task in build.xml
+                 -package-resources with the addition of a rename-manifest-package option. -->
+            <exec executable="${aapt}" failonerror="true">
+                <arg value="package" />
+                <arg value="-f" />
+                <arg value="--auto-add-overlay" />
+                <arg value="-M" />
+                <arg path="${basedir}/test/AndroidManifest.xml" />
+                <arg value="-S" />
+                <arg path="${basedir}/test/res" />
+                <arg value="-A" />
+                <arg path="${basedir}/assets" />
+                <arg value="-I" />
+                <arg path="${project.target.android.jar}" />
+                <arg value="-F" />
+                <arg path="${out.absolute.dir}/${resource.package.file.name}" />
+                <arg value="--rename-manifest-package" />
+                <arg value="in.celest.xash3d.hl" />
+            </exec>
+</target>
     <!-- Import the actual build file.
 
          To customize existing targets, there are two options:
@@ -89,4 +118,5 @@
     <!-- version-tag: 1 -->
     <import file="${sdk.dir}/tools/ant/build.xml" />
 
+
 </project>
diff --git a/jni/src/Xash3D/xash3d b/jni/src/Xash3D/xash3d
index d82c2731..afb86f7f 160000
--- a/jni/src/Xash3D/xash3d
+++ b/jni/src/Xash3D/xash3d
@@ -1 +1 @@
-Subproject commit d82c27313456b208d2e347e1fbe10e3d74fe1bf8
+Subproject commit afb86f7f8f2bb01e8e754825e023ac0eeef3f496
diff --git a/src/in/celest/xash3d/XashConfig.java b/src/in/celest/xash3d/XashConfig.java
new file mode 100644
index 00000000..cb345ad5
--- /dev/null
+++ b/src/in/celest/xash3d/XashConfig.java
@@ -0,0 +1,7 @@
+package in.celest.xash3d;
+public class XashConfig {
+public static final boolean PKG_TEST = false;
+public static final boolean CHECK_SIGNATURES = false;
+public static final boolean RELEASE = false;
+public static final boolean GP_VERSION = false;
+}