From 6ff9380912cacb872f2f16ba0053276f97560147 Mon Sep 17 00:00:00 2001
From: 0x330a <92654767+0x330a@users.noreply.github.com>
Date: Thu, 1 Dec 2022 10:33:48 +1100
Subject: [PATCH] fix: revert to static bundle for now so it compiles and runs
 tests

---
 libsession-util/libsession-util             | 2 +-
 libsession-util/src/main/cpp/CMakeLists.txt | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/libsession-util/libsession-util b/libsession-util/libsession-util
index ccd374af6a..7ffc9a6ec9 160000
--- a/libsession-util/libsession-util
+++ b/libsession-util/libsession-util
@@ -1 +1 @@
-Subproject commit ccd374af6af0fc43e041f0b38744ef02a043ad9d
+Subproject commit 7ffc9a6ec9460e74c78cc6d6eabd537075558774
diff --git a/libsession-util/src/main/cpp/CMakeLists.txt b/libsession-util/src/main/cpp/CMakeLists.txt
index 1027d9973f..17fc99b4ee 100644
--- a/libsession-util/src/main/cpp/CMakeLists.txt
+++ b/libsession-util/src/main/cpp/CMakeLists.txt
@@ -19,7 +19,7 @@ set(CMAKE_CXX_EXTENSIONS OFF)
 # You can define multiple libraries, and CMake builds them for you.
 # Gradle automatically packages shared libraries with your APK.
 
-set(BUILD_SHARED_LIBS ON CACHE BOOL "")
+set(STATIC_BUNDLE ON)
 add_subdirectory(../../../libsession-util libsession)
 
 add_library( # Sets the name of the library.
@@ -48,9 +48,9 @@ find_library( # Sets the name of the path variable.
 # ways that doesn't properly do this:
 get_target_property(sodium_lib_loc libsodium-internal IMPORTED_LOCATION)
 get_filename_component(sodium_lib_filename "${sodium_lib_loc}" NAME)
-add_custom_command(TARGET session_util POST_BUILD
-    COMMAND
-    ${CMAKE_COMMAND} -E copy ${sodium_lib_loc} ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libsodium.so)#${PROJECT_SOURCE_DIR}/../jniLibs/${CMAKE_ANDROID_ARCH_ABI}/${sodium_lib_filename})
+#add_custom_command(TARGET session_util POST_BUILD
+#    COMMAND
+#    ${CMAKE_COMMAND} -E copy ${sodium_lib_loc} ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${sodium_lib_loc})#${PROJECT_SOURCE_DIR}/../jniLibs/${CMAKE_ANDROID_ARCH_ABI}/${sodium_lib_filename})
 
 # Specifies libraries CMake should link to your target library. You
 # can link multiple libraries, such as libraries you define in this