4 files changed, 21 insertions, 10 deletions
diff --git a/external/boost/archive/portable_binary_iarchive.hpp b/external/boost/archive/portable_binary_iarchive.hpp
index 78d615f28..b67899b52 100644
--- a/external/boost/archive/portable_binary_iarchive.hpp
+++ b/external/boost/archive/portable_binary_iarchive.hpp
@@ -357,11 +357,11 @@ namespace detail {
     template class archive_serializer_map<portable_binary_iarchive>;
 }
 
-template class basic_binary_iprimitive<
-    portable_binary_iarchive,
-    std::istream::char_type, 
-    std::istream::traits_type
-> ;
+// template class basic_binary_iprimitive<
+//    portable_binary_iarchive,
+//    std::istream::char_type, 
+//    std::istream::traits_type
+//> ;
 
 } // namespace archive
 } // namespace boost
diff --git a/external/boost/archive/portable_binary_oarchive.hpp b/external/boost/archive/portable_binary_oarchive.hpp
index cdb4caf03..74afe2357 100644
--- a/external/boost/archive/portable_binary_oarchive.hpp
+++ b/external/boost/archive/portable_binary_oarchive.hpp
@@ -299,11 +299,11 @@ namespace detail {
     template class archive_serializer_map<portable_binary_oarchive>;
 }
 
-template class basic_binary_oprimitive<
-    portable_binary_oarchive,
-    std::ostream::char_type, 
-    std::ostream::traits_type
-> ;
+// template class basic_binary_oprimitive<
+//     portable_binary_oarchive,
+//     std::ostream::char_type, 
+//     std::ostream::traits_type
+// > ;
 
 } // namespace archive
 } // namespace boost
diff --git a/external/db_drivers/liblmdb/CMakeLists.txt b/external/db_drivers/liblmdb/CMakeLists.txt
index 00b203e94..3d55f0eae 100644
--- a/external/db_drivers/liblmdb/CMakeLists.txt
+++ b/external/db_drivers/liblmdb/CMakeLists.txt
@@ -30,6 +30,11 @@ if(FREEBSD)
   add_definitions(-DMDB_DSYNC=O_SYNC)
 endif()
 
+if(ANDROID)
+  add_definitions("-DANDROID=1")
+endif()
+
+
 set (lmdb_sources
 mdb.c
 midl.c)
diff --git a/external/unbound/compat/getentropy_linux.c b/external/unbound/compat/getentropy_linux.c
index 37d86a8f1..b8d4a2bd0 100644
--- a/external/unbound/compat/getentropy_linux.c
+++ b/external/unbound/compat/getentropy_linux.c
@@ -30,7 +30,13 @@
 #ifdef HAVE_SYS_SYSCTL_H
 #include <sys/sysctl.h>
 #endif
+#ifdef __ANDROID__
+#include <sys/vfs.h> 
+#define statvfs statfs 
+#define fstatvfs fstatfs 
+#else
 #include <sys/statvfs.h>
+#endif
 #include <sys/socket.h>
 #include <sys/mount.h>
 #include <sys/mman.h>