[Libreoffice-commits] online.git: kit/Kit.cpp

[Jan Holesovsky (via logerrit)]

 kit/Kit.cpp |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit fd3e6fb722dfb1d5da724cff1767bd7dd6ec91ea
Author:     Jan Holesovsky <kendy at collabora.com>
AuthorDate: Fri Feb 21 15:32:21 2020 +0100
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Fri Feb 21 16:46:01 2020 +0100

    android: Even with debug, the loolkitconfig.xcu path is the same.
    
    Change-Id: I28d72ce2776fb7640944a75d65586cf862fcbdbe
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/89213
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>

diff --git a/kit/Kit.cpp b/kit/Kit.cpp
index 60865cbbc..134abf2d6 100644
--- a/kit/Kit.cpp
+++ b/kit/Kit.cpp
@@ -2303,12 +2303,10 @@ void setupKitEnvironment()
         "userext:${${BRAND_BASE_DIR}/program/lounorc:UNO_USER_PACKAGES_CACHE}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini "
 #ifdef IOS
         "user:*${BRAND_BASE_DIR}/loolkitconfig.xcu "
-#else
-#if ENABLE_DEBUG // '*' denotes non-writable.
+#elif ENABLE_DEBUG && !defined(ANDROID) // '*' denotes non-writable.
         "user:*file://" DEBUG_ABSSRCDIR "/loolkitconfig.xcu "
 #else
         "user:*file://" LOOLWSD_CONFIGDIR "/loolkitconfig.xcu "
-#endif
 #endif
         );
     ::setenv("CONFIGURATION_LAYERS", layers.c_str(),