From 8cde7c7e7a44117cb14912722217c0ef2ae80479 Mon Sep 17 00:00:00 2001
From: Jeff <jeff@lokinet.io>
Date: Tue, 19 Jul 2022 11:31:14 -0400
Subject: [PATCH] fix win32 and android builds

---
 contrib/android-configure.sh | 2 ++
 contrib/windows.sh           | 2 ++
 daemon/lokinet.cpp           | 1 -
 external/oxen-logging        | 2 +-
 jni/CMakeLists.txt           | 1 -
 llarp/CMakeLists.txt         | 7 -------
 6 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/contrib/android-configure.sh b/contrib/android-configure.sh
index 2130b07cf..6a11c3778 100755
--- a/contrib/android-configure.sh
+++ b/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 \
diff --git a/contrib/windows.sh b/contrib/windows.sh
index 7520936e9..1c1a816f0 100755
--- a/contrib/windows.sh
+++ b/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 \
diff --git a/daemon/lokinet.cpp b/daemon/lokinet.cpp
index dbdb6be59..0cb1e20df 100644
--- a/daemon/lokinet.cpp
+++ b/daemon/lokinet.cpp
@@ -306,7 +306,6 @@ TellWindowsServiceStopped()
     else
       llarp::LogError("SetServiceStatus failed with an unknown error.");
   }
-  llarp::LogContext::Instance().ImmediateFlush();
 }
 
 class WindowsServiceStopped
diff --git a/external/oxen-logging b/external/oxen-logging
index 4db1754dc..7bc76a4f3 160000
--- a/external/oxen-logging
+++ b/external/oxen-logging
@@ -1 +1 @@
-Subproject commit 4db1754dcbba40cb353813f006ba1d2c3f404e6f
+Subproject commit 7bc76a4f367362892c2968fe336833770aaab3c0
diff --git a/jni/CMakeLists.txt b/jni/CMakeLists.txt
index 176d4a45e..000e25aa0 100644
--- a/jni/CMakeLists.txt
+++ b/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)
diff --git a/llarp/CMakeLists.txt b/llarp/CMakeLists.txt
index cf4bcb786..0782add06 100644
--- a/llarp/CMakeLists.txt
+++ b/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