[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - android/lib

[Jan Holesovsky (via logerrit)]

 android/lib/src/main/cpp/CMakeLists.txt.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit fd46d557144ddb2dd00b1c0d43858e50b93278ac
Author:     Jan Holesovsky <kendy at collabora.com>
AuthorDate: Mon Jun 29 16:13:19 2020 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Thu Jul 2 10:11:39 2020 +0200

    android: The location of liblo-native-code.so has changed.
    
    By mistake, the commit 526db8b1bdb6007ad3ab7e69c7c193e164e58892 was a wrong
    version of the patch; update it slightly.
    
    Change-Id: I1c0148a7195a577a14440453688d506b83aa6ab4
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97381
    Tested-by: Jan Holesovsky <kendy at collabora.com>
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97714
    Tested-by: Andras Timar <andras.timar at collabora.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/android/lib/src/main/cpp/CMakeLists.txt.in b/android/lib/src/main/cpp/CMakeLists.txt.in
index c0b08d1fa..fa9ed42a5 100644
--- a/android/lib/src/main/cpp/CMakeLists.txt.in
+++ b/android/lib/src/main/cpp/CMakeLists.txt.in
@@ -42,7 +42,7 @@ 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)
+set(LIBLO_NATIVE_CODE ${LOBUILDDIR_ABI}/android/jniLibs/${ANDROID_ABI}/liblo-native-code.so)
 
 target_include_directories(androidapp PRIVATE
                            .                     # path to androidapp.h