Android build fixes

This fixes #8079

diff --git a/build/android/Makefile b/build/android/Makefile
index 478a4690fbbf0d78a5a091930238581f84f53cad..c5a21c290b72c692b9a96f534273d6f36fa13ca9 100644 (file)
--- 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 a65eb5fc8469c412cbf533076ebd68de392cc5cd..233a64e1436c559a1a5e22a1743d8077fe0d4845 100644 (file)
--- 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"