From 0acdf936830f0bee6bff553201febedecb12a482 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Blot?= <loic.blot@unix-experience.fr>
Date: Wed, 9 Jan 2019 14:39:43 +0100
Subject: [PATCH] Android build fixes

This fixes #8079
---
 build/android/Makefile | 2 +-
 src/client/tile.cpp    | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/build/android/Makefile b/build/android/Makefile
index 478a4690..c5a21c29 100644
--- a/build/android/Makefile
+++ b/build/android/Makefile
@@ -312,7 +312,7 @@ $(OPENSSL_LIB): $(OPENSSL_TIMESTAMP)
 	export PATH="$${TOOLCHAIN}/bin:$${PATH}";                                  \
 	export CFLAGS="$${CFLAGS} ${TARGET_CFLAGS_ADDON}";                         \
 	export LDFLAGS="$${LDFLAGS} ${TARGET_LDFLAGS_ADDON}";                      \
-	CC=${CROSS_CC} ./Configure -DL_ENDIAN android-${TARGET_ARCH}               \
+	CC=${CROSS_CC} ./Configure -DL_ENDIAN no-asm android-${TARGET_ARCH}        \
 		-D__ANDROID_API__=$(API);                                          \
 	CC=${CROSS_CC} ANDROID_DEV=/tmp/ndk-${TARGET_HOST} make depend;            \
 	CC=${CROSS_CC} ANDROID_DEV=/tmp/ndk-${TARGET_HOST} make build_libs;        \
diff --git a/src/client/tile.cpp b/src/client/tile.cpp
index a65eb5fc..233a64e1 100644
--- a/src/client/tile.cpp
+++ b/src/client/tile.cpp
@@ -19,6 +19,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "tile.h"
 
+#include <cstring>
 #include <algorithm>
 #include <ICameraSceneNode.h>
 #include "util/string.h"