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

[Michael Meeks (via logerrit)]

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

New commits:
commit 7d4580733f27314a2ddf1290f6e92b0b07c96a52
Author:     Michael Meeks <michael.meeks at collabora.com>
AuthorDate: Mon Feb 24 22:10:36 2020 +0000
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Tue Feb 25 00:11:43 2020 +0100

    Un-break the XML by adding missing closing tag.
    
    Also get the path right in the CMake .in file.
    
    Change-Id: Ib0f02c5e4a71d04e40b7c353caea872a5ea9cfd6
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/89386
    Tested-by: Michael Meeks <michael.meeks at collabora.com>
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/android/lib/src/main/cpp/CMakeLists.txt.in b/android/lib/src/main/cpp/CMakeLists.txt.in
index b76d8fe97..29abef905 100644
--- a/android/lib/src/main/cpp/CMakeLists.txt.in
+++ b/android/lib/src/main/cpp/CMakeLists.txt.in
@@ -21,7 +21,7 @@ add_library(androidapp SHARED
             ../../../../../wsd/Storage.cpp
             ../../../../../wsd/TileCache.cpp)
 
-target_compile_definitions(androidapp PRIVATE LOOLWSD_CONFIGDIR="/etc/loolwsd") # TODO somewhere in assets maybe?
+target_compile_definitions(androidapp PRIVATE LOOLWSD_CONFIGDIR="/assets/etc/loolwsd")
 
 # According to the ABI, we need to use different source trees
 if(${ANDROID_ABI} STREQUAL "armeabi-v7a")
diff --git a/loolkitconfig-mobile.xcu b/loolkitconfig-mobile.xcu
index 5f46a712e..15d510fca 100644
--- a/loolkitconfig-mobile.xcu
+++ b/loolkitconfig-mobile.xcu
@@ -25,3 +25,5 @@
 <item oor:path="/org.openoffice.Office.Common/I18N/CJK"><prop oor:name="VerticalText" oor:op="fuse"><value>false</value></prop></item>
 <item oor:path="/org.openoffice.Office.Common/I18N/CTL"><prop oor:name="CTLFont" oor:op="fuse"><value>false</value></prop></item>
 
+</oor:items>
+