From 4192e2fff74ae2b8c46e5b3b95e0cfdb8ff0e8fa Mon Sep 17 00:00:00 2001
From: Sergey Fionov <fionov@gmail.com>
Date: Wed, 10 Oct 2018 21:06:50 +0300
Subject: [PATCH] Use Android NDK r18, use API 19 for 32-bit Android builds
 (#610)

Older Androids had some functions like `sigfillset` implemented as macros,
and `android-19` is the last backward-compatible and forward-compatible version
of unified headers.
---
 .travis.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f6d0deea..26bc1ab2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -195,14 +195,16 @@ before_deploy:
 after_deploy:
 - ls -l dnscrypt-proxy-*.tar.gz dnscrypt-proxy-*.zip
 before_install:
-- NDK_VER=r18-beta2
+- NDK_VER=r18
 - curl -LO http://dl.google.com/android/repository/android-ndk-${NDK_VER}-linux-x86_64.zip
 - unzip -q android-ndk-${NDK_VER}-linux-x86_64.zip -d $HOME
 - rm android-ndk-${NDK_VER}-linux-x86_64.zip
 - NDK_TOOLS=$HOME/android-ndk-${NDK_VER}
 - NDK_STANDALONE=$HOME/ndk-standalone-${NDK_VER}
 - MAKE_TOOLCHAIN=$NDK_TOOLS/build/tools/make_standalone_toolchain.py
-- for arch in x86 x86_64 arm arm64; do python $MAKE_TOOLCHAIN --arch $arch --api 21
+- for arch in x86 arm; do python $MAKE_TOOLCHAIN --arch $arch --api 19
+  --install-dir $NDK_STANDALONE/$arch; PATH=$PATH:$NDK_STANDALONE/$arch/bin; done
+- for arch in x86_64 arm64; do python $MAKE_TOOLCHAIN --arch $arch --api 21
   --install-dir $NDK_STANDALONE/$arch; PATH=$PATH:$NDK_STANDALONE/$arch/bin; done
 - rm -rf $NDK_TOOLS
 env: