[tor-commits] [orbot/master] update Makefile to target NDK 4.9

[n8fr8 at torproject.org]

commit c4867ba8d296c29a1c665e5e3929711ba76b6895
Author: n8fr8 <nathan at freitas.net>
Date:   Sat Oct 14 12:18:15 2017 -0400

    update Makefile to target NDK 4.9
---
 external/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/external/Makefile b/external/Makefile
index 5090e941..86e20d6b 100644
--- a/external/Makefile
+++ b/external/Makefile
@@ -24,7 +24,7 @@ endif
 # Android NDK setup
 ANDROID_NDK_HOME ?= /opt/android-ndk
 NDK_PLATFORM_LEVEL ?= 16
-NDK_TOOLCHAIN_VERSION=4.8
+NDK_TOOLCHAIN_VERSION=4.9
 APP_ABI ?= armeabi
 NDK_ABI ?= $(APP_ABI)
 
@@ -63,7 +63,7 @@ NDK_TOOLCHAIN_BASE=$(ANDROID_NDK_HOME)/toolchains/$(NDK_TOOLCHAIN)/prebuilt/$(ND
 
 # include Android's build flags
 TARGET_ARCH_ABI = $(APP_ABI)
-include $(ANDROID_NDK_HOME)/toolchains/$(NDK_TOOLCHAIN)/setup.mk
+#include $(ANDROID_NDK_HOME)/toolchains/$(NDK_TOOLCHAIN)/setup.mk
 
 CC := $(NDK_TOOLCHAIN_BASE)/bin/$(HOST)-gcc --sysroot=$(NDK_SYSROOT)
 CXX := $(NDK_TOOLCHAIN_BASE)/bin/$(HOST)-g++ --sysroot=$(NDK_SYSROOT)