android/lib/src/main/cpp/CMakeLists.txt.in | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
New commits:
commit 526db8b1bdb6007ad3ab7e69c7c193e164e58892
Author: Jan Holesovsky <ke...@collabora.com>
AuthorDate: Mon Jun 29 15:35:07 2020 +0200
Commit: Jan Holesovsky <ke...@collabora.com>
CommitDate: Mon Jun 29 16:02:55 2020 +0200
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 <ke...@collabora.com>
Reviewed-by: Jan Holesovsky <ke...@collabora.com>
diff --git a/android/lib/src/main/cpp/CMakeLists.txt.in
b/android/lib/src/main/cpp/CMakeLists.txt.in
index c1fec9f78..8f4e9fe2a 100644
--- a/android/lib/src/main/cpp/CMakeLists.txt.in
+++ b/android/lib/src/main/cpp/CMakeLists.txt.in
@@ -43,11 +43,7 @@ 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()
+set(LIBLO_NATIVE_CODE
${LOBUILDDIR_ABI}/android/source/jniLibs/${ANDROID_ABI}/liblo-native-code.so)
target_include_directories(androidapp PRIVATE
. # path to androidapp.h
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
