fix win32 and android builds

contrib/android-configure.sh

@@ -37,6 +37,8 @@ for abi in $build_abis; do
         -DWITH_SYSTEMD=OFF \
         -DFORCE_OXENMQ_SUBMODULE=ON \
         -DFORCE_OXENC_SUBMODULE=ON \
+        -DFORCE_LOGGING_SUBMODULE=ON \
+        -DFORCE_NLOHMANN_SUBMODULE=ON \
         -DSUBMODULE_CHECK=OFF \
         -DWITH_LTO=OFF \
         -DCMAKE_BUILD_TYPE=Release \

contrib/windows.sh

@@ -24,6 +24,8 @@ cmake \
       -DWITH_SYSTEMD=OFF \
       -DFORCE_OXENMQ_SUBMODULE=ON \
       -DFORCE_OXENC_SUBMODULE=ON \
+      -DFORCE_LOGGING_SUBMODULE=ON \
+      -DFORCE_NLOHMANN_SUBMODULE=ON \
       -DSUBMODULE_CHECK=OFF \
       -DWITH_LTO=OFF \
       -DCMAKE_BUILD_TYPE=Release \

daemon/lokinet.cpp

@@ -306,7 +306,6 @@ TellWindowsServiceStopped()
     else
       llarp::LogError("SetServiceStatus failed with an unknown error.");
   }
-  llarp::LogContext::Instance().ImmediateFlush();
 }
 
 class WindowsServiceStopped

external/oxen-logging

@@ -1 +1 @@
-Subproject commit 4db1754dcbba40cb353813f006ba1d2c3f404e6f
+Subproject commit 7bc76a4f367362892c2968fe336833770aaab3c0

jni/CMakeLists.txt

@@ -2,5 +2,4 @@ add_library(lokinet-android
     SHARED
     lokinet_config.cpp
     lokinet_daemon.cpp)
-add_log_tag(lokinet-android)
 target_link_libraries(lokinet-android liblokinet)

llarp/CMakeLists.txt

@@ -28,13 +28,6 @@ target_link_libraries(lokinet-util PUBLIC
   oxen::logging
 )
 
-if(ANDROID)
-  target_sources(lokinet-util PRIVATE util/logging/android_logger.cpp)
-  target_link_libraries(lokinet-util PUBLIC log)
-elseif(WIN32)
-  target_sources(lokinet-util PRIVATE util/logging/win32_logger.cpp)
-endif()
-
 add_library(lokinet-platform
   STATIC
   # for networking