add more android stuff

CMakeLists.txt

@@ -263,7 +263,7 @@ set(LIBS ${MALLOC_LIB} ${FS_LIB})
 if(ANDROID)
   list(APPEND LIBS log)
   add_definitions(-DANDROID)
-  set(ANDROID_PLATFORM_SRC llarp/android/ifaddrs.c)
+  set(ANDROID_PLATFORM_SRC android/ifaddrs.c)
 endif(ANDROID)
 
 set(LIB lokinet)

Makefile

@@ -40,7 +40,7 @@ TESTNET_NETID ?= loopback
 ANDROID_NDK ?= $(HOME)/Android/Ndk
 ANDROID_SDK ?= $(HOME)/Android/Sdk
 ANDROID_ABI ?= armeabi-v7a
-ANDROID_API_LEVEL ?= 18
+ANDROID_API_LEVEL ?= 24
 
 ANDROID_DIR=$(REPO)/android
 JNI_DIR=$(ANDROID_DIR)/jni

android/build.gradle

@@ -26,7 +26,7 @@ android {
         targetSdkVersion 28
         minSdkVersion 14
         versionCode 1
-        versionName "0.3.1"
+        versionName "0.4.0"
         ndk {
             abiFilters 'armeabi'
         }

android/src/network/loki/lokinet/LokiNetActivity.java

@@ -75,6 +75,7 @@ public class LokiNetActivity extends Activity {
 		bootstrapper.execute(DefaultBootstrapURL);
 	}
 
+  
 	public void runLokinetService()
 	{
 		startService(new Intent(LokiNetActivity.this,

android/src/network/loki/lokinet/LokinetService.java

@@ -0,0 +1,8 @@
+package network.loki.lokinet;
+
+
+import android.net.VpnService;
+
+public class LokinetService extends VpnService
+{
+}

test/ev/test_ev_loop.cpp

@@ -98,7 +98,8 @@ TEST_F(EventLoopTest, PipeWrite1K)
     Data_t data;
     size_t idx = 0;
     std::function< void(void) > stop;
-    TestPipe(size_t num, llarp_ev_loop_ptr l, std::function< void(void) > _stop)
+    TestPipe(const size_t num, llarp_ev_loop_ptr l,
+             std::function< void(void) > _stop)
         : llarp_ev_pkt_pipe(l), stop(_stop)
     {
       data.resize(num);

vendor/nlohmann/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.7)
+cmake_minimum_required(VERSION 3.6)
 
 ##
 ## PROJECT