From ad5c9b12cf25c7463c0d6860fac374bc04894487 Mon Sep 17 00:00:00 2001
From: Ralph-Gordon Paul <gordon@rgpaul.com>
Date: Tue, 11 Dec 2018 11:43:58 +0100
Subject: [PATCH] Add NDK r18b

---
 .travis.yml | 49 +++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 45 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 16fea85d8..9adfc3f8c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,10 +20,6 @@ before_install:
   # Get version from git tag
   - export TRAVIS_TAG=$(git describe --abbrev=0 --tags)
 
-  # Download Google Drive Downloader
-  - curl -OL https://gist.githubusercontent.com/Manromen/4e4cf28ddf5bf2e4ee5cc2dfe4055952/raw/77d59731d3523f51d312254c6fd36427b3ea49b5/googleDriveDownload.sh
-  - chmod +x googleDriveDownload.sh;
-
   # Download Android NDK from Google
   - curl -OL "https://dl.google.com/android/repository/android-ndk-${TRAVIS_ANDROID_NDK_VERSION}-linux-x86_64.zip"
   - unzip -q -o android-ndk-${TRAVIS_ANDROID_NDK_VERSION}-linux-x86_64.zip
@@ -32,6 +28,51 @@ before_install:
 matrix:
   include:
 
+    ### Boost 1.68.0 - NDK r18b ###
+    # arm64-v8a
+    - os: linux
+      env:
+        - TRAVIS_ANDROID_NDK_VERSION=r18b
+        - TRAVIS_BOOST_VERSION=1.68.0
+        - TRAVIS_ANDROID_ARCH=arm64-v8a
+      addons:
+      apt:
+        sources: ['ubuntu-toolchain-r-test']
+        packages: ['g++-5' ]
+
+    # armeabi-v7a
+    - os: linux
+      env:
+        - TRAVIS_ANDROID_NDK_VERSION=r18b
+        - TRAVIS_BOOST_VERSION=1.68.0
+        - TRAVIS_ANDROID_ARCH=armeabi-v7a
+      addons:
+      apt:
+        sources: ['ubuntu-toolchain-r-test']
+        packages: ['g++-5' ]
+
+    # x86
+    - os: linux
+      env:
+        - TRAVIS_ANDROID_NDK_VERSION=r18b
+        - TRAVIS_BOOST_VERSION=1.68.0
+        - TRAVIS_ANDROID_ARCH=x86
+      addons:
+      apt:
+        sources: ['ubuntu-toolchain-r-test']
+        packages: ['g++-5' ]
+
+    # x86_64
+    - os: linux
+      env:
+        - TRAVIS_ANDROID_NDK_VERSION=r18b
+        - TRAVIS_BOOST_VERSION=1.68.0
+        - TRAVIS_ANDROID_ARCH=x86_64
+      addons:
+      apt:
+        sources: ['ubuntu-toolchain-r-test']
+        packages: ['g++-5' ]
+
     ### Boost 1.68.0 - NDK r18 ###
     # arm64-v8a
     - os: linux