From 4082a18406c18af7b4fcef7bd501c3679c3be56b Mon Sep 17 00:00:00 2001 From: Christian Lohmaier Date: Wed, 22 Nov 2017 23:08:06 +0100 Subject: android: use unified headers and llvm-c++ STL (x86) with NDK 16 gnustl (and others) are to be removed in future versions of the ndk also bump gradle and build-tools to current versions along with it arm unfortunately crashes with llvm-c++, so keep with gnustl for now/fix that later Change-Id: Ic794c3293b599b77ec48096bf3283a99c09cbb79 Reviewed-on: https://gerrit.libreoffice.org/45163 Reviewed-by: Christian Lohmaier Tested-by: Christian Lohmaier --- config_host.mk.in | 1 + 1 file changed, 1 insertion(+) (limited to 'config_host.mk.in') diff --git a/config_host.mk.in b/config_host.mk.in index 0cc343cd351d..cf9cefbd0fc8 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -20,6 +20,7 @@ export ANDROID_NDK_HOME=@ANDROID_NDK_HOME@ export ANDROID_APP_ABI=@ANDROID_APP_ABI@ export ANDROID_SDK_HOME=@ANDROID_SDK_HOME@ export ANDROID_PACKAGE_NAME=@ANDROID_PACKAGE_NAME@ +export ANDROID_BINUTILS_PREBUILT_ROOT=@ANDROID_BINUTILS_PREBUILT_ROOT@ export ANDROID_GCC_TOOLCHAIN_VERSION=@ANDROID_GCC_TOOLCHAIN_VERSION@ export ANT=@ANT@ export ANT_HOME=@ANT_HOME@ -- cgit v1.2.3