change makefile.android

src/bitcoinrpc.cpp

@@ -590,7 +590,11 @@ public:
     }
     bool connect(const std::string& server, const std::string& port)
     {
+#if (BOOST_VERSION >= 107000) // boost >= 1.70
+		ip::tcp::resolver resolver(stream.get_executor ());
+#else
         ip::tcp::resolver resolver(stream.get_io_service());
+#endif
         ip::tcp::resolver::query query(server.c_str(), port.c_str());
         ip::tcp::resolver::iterator endpoint_iterator = resolver.resolve(query);
         ip::tcp::resolver::iterator end;
@@ -625,8 +629,14 @@ template <typename Protocol>
 class AcceptedConnectionImpl : public AcceptedConnection
 {
 public:
+#if (BOOST_VERSION >= 107000) // boost >= 1.70	
+    template<typename Executor>	
+    AcceptedConnectionImpl(
+            Executor io_service,
+#else
     AcceptedConnectionImpl(
-            asio::io_service& io_service,
+            asio::io_service& io_service,	    
+#endif	    
             ssl::context &context,
             bool fUseSSL) :
         sslStream(io_service, context),
@@ -677,7 +687,11 @@ static void RPCListen(boost::shared_ptr< basic_socket_acceptor<Protocol, SocketA
                    const bool fUseSSL)
 {
     // Accept connection
+#if (BOOST_VERSION >= 107000) // boost >= 1.70
+	AcceptedConnectionImpl<Protocol>* conn = new AcceptedConnectionImpl<Protocol>(acceptor->get_executor (), context, fUseSSL);
+#else
     AcceptedConnectionImpl<Protocol>* conn = new AcceptedConnectionImpl<Protocol>(acceptor->get_io_service(), context, fUseSSL);
+#endif
 
     acceptor->async_accept(
             conn->sslStream.lowest_layer(),

src/makefile.android

@@ -13,21 +13,19 @@ endif
 
 # CHANGE IT FOR YOU
 #
-STANDALONE=/home/lialh4/Android/Sdk/ndk/arm-linux-androideabi/
-SYSROOT=--sysroot=$(STANDALONE)/sysroot
-CXFLAGS=$SYSROOT
-ARCH=armv7a
-V=28
-CXX=$(STANDALONE)/bin/clang++
-CC=$(STANDALONE)/bin/clang 
+#STANDALONE=/home/lialh4/Android/Sdk/ndk/arm-linux-androideabi/
+SYSROOT=--sysroot=$(ANDROID_SYSROOT)
+CXFLAGS=$(SYSROOT)
+CXX=$(ANDROID_TOOLCHAIN)/arm-linux-androideabi-g++
+CC=$(ANDROID_TOOLCHAIN)/arm-linux-androideabi-gcc
 #
 # #
 LINK:=$(CXX)
 LDFLAGS=
 DEFS=-DBOOST_SPIRIT_THREADSAFE -DBOOST_THREAD_USE_LIB -DBOOST_NO_CXX11_SCOPED_ENUMS -DBOOST_ASIO_ENABLE_OLD_SERVICES -D_FILE_OFFSET_BITS=64 -DUSE_NATIVE_I2P
 
-DEFS += $(addprefix -I,$(CURDIR) $(CURDIR)/obj $(CURDIR)/i2psam $(BOOST_INCLUDE_PATH) $(BDB_INCLUDE_PATH) $(OPENSSL_INCLUDE_PATH) $(ANDROID_INCLUDE_PATH) $(STANDALONE)/sysroot/usr/include/)
-LIBS = $(addprefix -L,$(BOOST_LIB_PATH) $(BDB_LIB_PATH) $(OPENSSL_LIB_PATH) $(ANDROID_LIB_PATH) $(STANDALONE)/sysroot/usr/lib/$(ARCH)-linux-android)
+DEFS += $(addprefix -I,$(CURDIR) $(CURDIR)/obj $(CURDIR)/i2psam $(BOOST_INCLUDE_PATH) $(BDB_INCLUDE_PATH) $(OPENSSL_INCLUDE_PATH) $(ANDROID_INCLUDE_PATH) $(ANDROID_DEV)/include $(ANDROID_SYSROOT)/usr/include)
+LIBS = $(addprefix -L,$(BOOST_LIB_PATH) $(BDB_LIB_PATH) $(OPENSSL_LIB_PATH) $(ANDROID_LIB_PATH) $(ANDROID_DEV)/lib)
 
 LMODE = static
 LMODE2 = dynamic