[Libreoffice-commits] online.git: android/lib

Henry Castro (via logerrit) logerrit at kemper.freedesktop.org
Wed Aug 12 11:38:49 UTC 2020


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

New commits:
commit b6520bdaeb23f66a951a9458594f1c8bfc900093
Author:     Henry Castro <hcastro at collabora.com>
AuthorDate: Tue Aug 11 17:35:05 2020 -0400
Commit:     Henry Castro <hcastro at collabora.com>
CommitDate: Wed Aug 12 13:38:30 2020 +0200

    android: fix the include directories when builddir != srcdir
    
    Change-Id: I81e823354129c510c43d606f0e56f0cbf92c5eef
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100568
    Tested-by: Jenkins
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Henry Castro <hcastro at collabora.com>

diff --git a/android/lib/src/main/cpp/CMakeLists.txt.in b/android/lib/src/main/cpp/CMakeLists.txt.in
index 4c4e1344a..2a9fc36b0 100644
--- a/android/lib/src/main/cpp/CMakeLists.txt.in
+++ b/android/lib/src/main/cpp/CMakeLists.txt.in
@@ -52,7 +52,8 @@ set(LIBLO_NATIVE_CODE ${LOBUILDDIR_ABI}/android/jniLibs/${ANDROID_ABI}/liblo-nat
 
 target_include_directories(androidapp PRIVATE
                            .                     # path to androidapp.h
-                           ../../../../..        # path to config.h
+			   @abs_top_builddir@    # path to config.h
+			   @abs_top_srcdir@
                            ../../../../../common # the needed loolwsd includes
                            ../../../../../kit
                            ../../../../../net


More information about the Libreoffice-commits mailing list