TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-11-25 11:05:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: revert to static bundle for now so it compiles and runs tests

Browse Source
This commit is contained in:
0x330a 2022-12-01 10:33:48 +11:00
parent aeb40833ff
commit 6ff9380912
No known key found for this signature in database
GPG Key ID: 267811D6E6A2698C
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libsession-util/libsession-util

@ -1 +1 @@
Subproject commit ccd374af6af0fc43e041f0b38744ef02a043ad9d Subproject commit 7ffc9a6ec9460e74c78cc6d6eabd537075558774

8
libsession-util/src/main/cpp/CMakeLists.txt
View File

@ -19,7 +19,7 @@ set(CMAKE_CXX_EXTENSIONS OFF)
# You can define multiple libraries, and CMake builds them for you. # You can define multiple libraries, and CMake builds them for you.
# Gradle automatically packages shared libraries with your APK. # 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_subdirectory(../../../libsession-util libsession)
add_library( # Sets the name of the library. 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: # ways that doesn't properly do this:
get_target_property(sodium_lib_loc libsodium-internal IMPORTED_LOCATION) get_target_property(sodium_lib_loc libsodium-internal IMPORTED_LOCATION)
get_filename_component(sodium_lib_filename "${sodium_lib_loc}" NAME) get_filename_component(sodium_lib_filename "${sodium_lib_loc}" NAME)
add_custom_command(TARGET session_util POST_BUILD #add_custom_command(TARGET session_util POST_BUILD
COMMAND # 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}) # ${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 # Specifies libraries CMake should link to your target library. You
# can link multiple libraries, such as libraries you define in this # can link multiple libraries, such as libraries you define in this