From b5350e27ad7bc54a3a97db988119db83c67f96b3 Mon Sep 17 00:00:00 2001
From: stujones11 <stujones111@gmail.com>
Date: Wed, 15 Nov 2017 19:52:19 +0000
Subject: Android: Update build system for ndk-r15x

Add workarounds for ndk-r16.
---
 build/android/jni/Application.mk | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'build/android/jni/Application.mk')

diff --git a/build/android/jni/Application.mk b/build/android/jni/Application.mk
index 53467059a..dfe7afb3d 100644
--- a/build/android/jni/Application.mk
+++ b/build/android/jni/Application.mk
@@ -1,9 +1,9 @@
-# NDK_TOOLCHAIN_VERSION := clang3.8
-
-APP_PLATFORM := android-9
-APP_MODULES := minetest
+APP_PLATFORM := ${APP_PLATFORM}
+APP_ABI := ${TARGET_ABI}
 APP_STL := gnustl_static
+NDK_TOOLCHAIN_VERSION := 4.9
+APP_DEPRECATED_HEADERS := true
+APP_MODULES := minetest
 
 APP_CPPFLAGS += -fexceptions
 APP_GNUSTL_FORCE_CPP_FEATURES := rtti
-
-- 
cgit v1.2.3