From: Loïc Blot <loic.blot@unix-experience.fr>
Date: Wed, 9 Jan 2019 13:39:43 +0000 (+0100)
Subject: Android build fixes
X-Git-Tag: 5.0.0~84
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=0acdf936830f0bee6bff553201febedecb12a482;p=oweals%2Fminetest.git

Android build fixes

This fixes #8079
---

diff --git a/build/android/Makefile b/build/android/Makefile
index 478a4690f..c5a21c290 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 a65eb5fc8..233a64e14 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"