Fix android build

diff --git a/build/android/jni/Android.mk b/build/android/jni/Android.mk
index 9cf85328b89b1dc623cd97384fbba291fcfd5327..c3982c370f447136ad16ae4df1473a8c576a2713 100644 (file)
--- a/build/android/jni/Android.mk
+++ b/build/android/jni/Android.mk
@@ -102,7 +102,6 @@ LOCAL_C_INCLUDES :=                               \
 
 LOCAL_SRC_FILES :=                                \
                jni/src/ban.cpp                           \
-               jni/src/base64.cpp                        \
                jni/src/camera.cpp                        \
                jni/src/cavegen.cpp                       \
                jni/src/chat.cpp                          \
@@ -189,7 +188,6 @@ LOCAL_SRC_FILES :=                                \
                jni/src/server.cpp                        \
                jni/src/serverlist.cpp                    \
                jni/src/serverobject.cpp                  \
-               jni/src/sha1.cpp                          \
                jni/src/shader.cpp                        \
                jni/src/sky.cpp                           \
                jni/src/socket.cpp                        \
@@ -204,10 +202,12 @@ LOCAL_SRC_FILES :=                                \
                jni/src/version.cpp                       \
                jni/src/voxel.cpp                         \
                jni/src/voxelalgorithms.cpp               \
+               jni/src/util/base64.cpp                   \
                jni/src/util/directiontables.cpp          \
                jni/src/util/numeric.cpp                  \
                jni/src/util/pointedthing.cpp             \
                jni/src/util/serialize.cpp                \
+               jni/src/util/sha1.cpp                     \
                jni/src/util/string.cpp                   \
                jni/src/util/timetaker.cpp                \
                jni/src/touchscreengui.cpp                \