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

feat: change build.gradle, cmakelists to fix runtime

Browse Source
This commit is contained in:
0x330a 2022-11-30 15:39:47 +11:00
parent 42ecef4ffa
commit 59b942b6ae
No known key found for this signature in database
GPG Key ID: 267811D6E6A2698C
3 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libsession-util/build.gradle
View File

@ -16,9 +16,6 @@ android {
cmake { cmake {
} }
} }
// ndk {
// abiFilters 'x86_64', 'arm64-v8a' ,'x86', 'armeabi-v7a'
// }
} }
buildTypes { buildTypes {

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

@ -47,9 +47,10 @@ find_library( # Sets the name of the path variable.
# Copy libsodium-internal.so into the library output dir manually because gradle invokes cmake in # Copy libsodium-internal.so into the library output dir manually because gradle invokes cmake in
# 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)
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}) ${CMAKE_COMMAND} -E copy ${sodium_lib_loc} ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libsodium.so)#${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

11
libsession-util/src/main/java/network/loki/messenger/libsession_util/NativeLib.kt
View File

@ -1,11 +0,0 @@
package network.loki.messenger.libsession_util
class NativeLib {
companion object {
// Used to load the 'libsession_util' library on application startup.
init {
System.loadLibrary("session_util")
}
}
}