From 905a1c4b625df98e8fe4c7f2f0e7e0d7a6e46ca9 Mon Sep 17 00:00:00 2001 From: 0x330a <92654767+0x330a@users.noreply.github.com> Date: Wed, 19 Apr 2023 14:10:25 +1000 Subject: [PATCH] fix: new build on normal repo --- .gitmodules | 2 +- libsession-util/src/main/cpp/CMakeLists.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 59baf05b7c..b650b98b11 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "libsession-util/libsession-util"] path = libsession-util/libsession-util - url = https://github.com/jagerman/libsession-util.git + url = https://github.com/oxen-io/libsession-util.git diff --git a/libsession-util/src/main/cpp/CMakeLists.txt b/libsession-util/src/main/cpp/CMakeLists.txt index e3b6f2912c..e12a2dee11 100644 --- a/libsession-util/src/main/cpp/CMakeLists.txt +++ b/libsession-util/src/main/cpp/CMakeLists.txt @@ -54,8 +54,8 @@ find_library( # Sets the name of the path variable. # Copy libsodium-internal.so into the library output dir manually because gradle invokes cmake in # 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) +#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}/${sodium_lib_loc})#${PROJECT_SOURCE_DIR}/../jniLibs/${CMAKE_ANDROID_ARCH_ABI}/${sodium_lib_filename})