From 53d2d10932c885b0486be074a5d7d9e1497860cc Mon Sep 17 00:00:00 2001
From: Alibek Omarov <a1ba.omarov@gmail.com>
Date: Wed, 9 Oct 2019 02:15:16 +0300
Subject: [PATCH] travis: add Android 64 and Android hardfp experimental builds

---
 .travis.yml                    | 53 +++++++++++++++++++++++++++++++++-
 scripts/travis_android_deps.sh |  9 +++++-
 2 files changed, 60 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a7787849..f12ce30d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -91,6 +91,57 @@ jobs:
       after_script:
         - ccache --show-stats
         - sh ../scripts/continious_upload.sh xashdroid.apk
+    - # ...
+      name: "Build for Android 64"
+      cache: ccache
+      os: linux
+      dist: xenial
+      language: java # we want xenial, so just java, not android
+      jdk: openjdk8
+      before_script:
+        - export ANDROID_HOME=$TRAVIS_BUILD_DIR/sdk
+        - sh scripts/travis_common_deps.sh
+        - sh scripts/travis_android_deps.sh
+        - export ANDROID_SDK_HOME=$ANDROID_HOME
+        - export ANDROID_NDK_HOME=$ANDROID_SDK_HOME/ndk-bundle
+      script:
+        - cd android
+        - export ARCH="aarch64 x86_64"
+        - sh compile.sh release
+      after_script:
+        - ccache --show-stats
+        - mv xashdroid.apk xashdroid-64-test.apk
+        - sh ../scripts/continious_upload.sh xashdroid-64-test.apk
+    - # ...
+      name: "Build for Android arm hardfp"
+      cache: ccache
+      os: linux
+      dist: xenial
+      language: java # we want xenial, so just java, not android
+      jdk: openjdk8
+      addons:
+        apt:
+          packages:
+            - clang-9
+          sources:
+            - sourceline: 'deb https://apt.llvm.org/xenial/ llvm-toolchain-xenial-9 main'
+              key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key'
+          
+      before_script:
+        - export ANDROID_HOME=$TRAVIS_BUILD_DIR/sdk
+        - sh scripts/travis_common_deps.sh
+        - sh scripts/travis_android_deps.sh r10e
+        - export ANDROID_SDK_HOME=$ANDROID_HOME
+        - export ANDROID_NDK_HOME=$ANDROID_SDK_HOME/ndk-bundle
+      script:
+        - cd android
+        - export ARCH="armeabi-v7a-hard"
+        - export TOOLCHAIN="host"
+        - sh compile.sh release
+      after_script:
+        - ccache --show-stats
+        - mv xashdroid.apk xashdroid-hardfp-test.apk
+        - sh ../scripts/continious_upload.sh xashdroid-hardfp-test.apk
 #    - # ...
 #      name: "Build for Windows MinGW"
 #      cache: ccache
@@ -139,4 +190,4 @@ jobs:
       os: linux
       cache: false
       script:
-        - sh scripts/travis-deploy.sh xash3d-fwgs-i686.AppImage xash3d-fwgs-x86_64.AppImage xash3d-vc.7z xash3d-vc2008-sln.7z xashdroid.apk xashds-linux-i686 xashds-linux-x86_64
+        - sh scripts/travis-deploy.sh xash3d-fwgs-i686.AppImage xash3d-fwgs-x86_64.AppImage xash3d-vc.7z xash3d-vc2008-sln.7z xashdroid.apk xashdroid-64-test.apk xashdroid-hardfp-test.apk xashds-linux-i686 xashds-linux-x86_64
diff --git a/scripts/travis_android_deps.sh b/scripts/travis_android_deps.sh
index f023b328..53b4a1c8 100755
--- a/scripts/travis_android_deps.sh
+++ b/scripts/travis_android_deps.sh
@@ -15,7 +15,14 @@ cd $TRAVIS_BUILD_DIR
 
 echo "Download all needed tools and NDK"
 yes | sdk/tools/bin/sdkmanager --licenses > /dev/null 2>/dev/null # who even reads licenses? :)
-sdk/tools/bin/sdkmanager --install build-tools\;29.0.1 platform-tools platforms\;android-19 ndk-bundle > /dev/null 2>/dev/null
+NDK_BUNDLE="ndk-bundle"
+if [ "$1" = "r10e" ]; then
+	NDK_BUNDLE=""
+	wget http://dl.google.com/android/ndk/android-ndk-r10e-linux-x86_64.bin >/dev/null 2>/dev/null
+	7z x ./android-ndk-r10e-linux-x86_64.bin > /dev/null
+	mv android-ndk-r10e ndk-bundle
+fi
+sdk/tools/bin/sdkmanager --install build-tools\;29.0.1 platform-tools platforms\;android-19 $NDK_BUNDLE > /dev/null 2>/dev/null
 
 echo "Download Xash3D FWGS Android source"
 git clone --depth 1 https://github.com/FWGS/xash3d-android-project -b waf android || exit 1