android/lib/src/main/cpp/CMakeLists.txt.in | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
New commits:
commit 56fb5793320254e8d46618be789e143e014fb83c
Author: Henry Castro <hcas...@collabora.com>
AuthorDate: Fri Jun 5 10:26:48 2020 -0400
Commit: Henry Castro <hcas...@collabora.com>
CommitDate: Thu Jun 11 18:27:58 2020 +0200
android: fix build when builddir != srcdir
Unfortunately the "liblo-native-code.so" file is located
in the LO source directory
Change-Id: I43ad3313ad2dba62d987cbdbaed5de490c52b9cc
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95608
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Henry Castro <hcas...@collabora.com>
diff --git a/android/lib/src/main/cpp/CMakeLists.txt.in
b/android/lib/src/main/cpp/CMakeLists.txt.in
index ad43e806c..7715dbbdc 100644
--- a/android/lib/src/main/cpp/CMakeLists.txt.in
+++ b/android/lib/src/main/cpp/CMakeLists.txt.in
@@ -38,6 +38,12 @@ else()
MESSAGE(FATAL_ERROR "Cannot build for ABI ${ANDROID_ABI}, please add
support for that.")
endif()
+if(EXISTS
${LOBUILDDIR_ABI}/android/jniLibs/${ANDROID_ABI}/liblo-native-code.so)
+ set(LIBLO_NATIVE_CODE
${LOBUILDDIR_ABI}/android/jniLibs/${ANDROID_ABI}/liblo-native-code.so)
+else()
+ set(LIBLO_NATIVE_CODE
${LOBUILDDIR_ABI}/android/source/jniLibs/${ANDROID_ABI}/liblo-native-code.so)
+endif()
+
target_include_directories(androidapp PRIVATE
. # path to androidapp.h
../../../../.. # path to config.h
@@ -88,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."
)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
