diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2020-06-29 15:35:07 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2020-07-02 10:16:17 +0200 |
| commit | 881e2a696ab787b50de25cae80c9d39c3ce275d8 (patch) | |
| tree | d7f359be50248755a4b05622d486681a16a001cb | |
| parent | android: Update POCO instructions to 1.10.1. (diff) | |
| download | online-881e2a696ab787b50de25cae80c9d39c3ce275d8.tar.gz online-881e2a696ab787b50de25cae80c9d39c3ce275d8.zip | |
android: The location of liblo-native-code.so has changed.
Don't try to look it up at the old location, that'll only cause
problems.
Change-Id: I6376770ce09c5a19cfe1514e1fd12c508a5fc3d0
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97420
Tested-by: Jan Holesovsky <kendy@collabora.com>
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97713
Tested-by: Andras Timar <andras.timar@collabora.com>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
| -rw-r--r-- | android/lib/src/main/cpp/CMakeLists.txt.in | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/android/lib/src/main/cpp/CMakeLists.txt.in b/android/lib/src/main/cpp/CMakeLists.txt.in index 02e2bbb3f9..c0b08d1fa4 100644 --- a/android/lib/src/main/cpp/CMakeLists.txt.in +++ b/android/lib/src/main/cpp/CMakeLists.txt.in @@ -42,6 +42,8 @@ else() MESSAGE(FATAL_ERROR "Cannot build for ABI ${ANDROID_ABI}, please add support for that.") endif() +set(LIBLO_NATIVE_CODE ${LOBUILDDIR_ABI}/android/source/jniLibs/${ANDROID_ABI}/liblo-native-code.so) + target_include_directories(androidapp PRIVATE . # path to androidapp.h ../../../../.. # path to config.h @@ -92,8 +94,8 @@ add_custom_command(OUTPUT "${CMAKE_CURRENT_SOURCE_DIR}/lib/${ANDROID_ABI}/liblo- COMMAND ${CMAKE_COMMAND} -E copy ${LOBUILDDIR_ABI}/instdir/program/libssl3.so "${CMAKE_CURRENT_SOURCE_DIR}/lib/${ANDROID_ABI}" DEPENDS ${LOBUILDDIR_ABI}/instdir/program/libssl3.so - COMMAND ${CMAKE_COMMAND} -E copy ${LOBUILDDIR_ABI}/android/source/jniLibs/${ANDROID_ABI}/liblo-native-code.so "${CMAKE_CURRENT_SOURCE_DIR}/lib/${ANDROID_ABI}" - DEPENDS ${LOBUILDDIR_ABI}/android/source/jniLibs/${ANDROID_ABI}/liblo-native-code.so + COMMAND ${CMAKE_COMMAND} -E copy ${LIBLO_NATIVE_CODE} "${CMAKE_CURRENT_SOURCE_DIR}/lib/${ANDROID_ABI}" + DEPENDS ${LIBLO_NATIVE_CODE} COMMENT "Copied liblo-native-code.so and its dependencies to the tree." ) |