[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-4' - configure.ac wsd/LOOLWSD.cpp

[Libreoffice Gerrit user]

 configure.ac    |    3 +++
 wsd/LOOLWSD.cpp |    4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 0210a032244846bd2b8655a383c8300fce036230
Author:     Jan Holesovsky <kendy at collabora.com>
AuthorDate: Tue Feb 12 10:15:51 2019 +0100
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Fri May 3 14:51:59 2019 +0100

    android: Define MOBILEAPP via config.h.
    
    Change-Id: I58910f28827b576f17a7d196f873780a2fe6939b
    Signed-off-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/configure.ac b/configure.ac
index 394e71f1e..9dcc67620 100644
--- a/configure.ac
+++ b/configure.ac
@@ -452,13 +452,16 @@ AS_IF([test "$ENABLE_GTKAPP" = true],
 AM_CONDITIONAL([ENABLE_DEBUG], [test "$ENABLE_DEBUG" = "true"])
 
 mobile_app=
+MOBILEAPP=
 AC_MSG_CHECKING([Is this a mobile app])
 if test "$enable_gtkapp" = "yes" -o "$enable_iosapp" = "yes"; then
      AC_MSG_RESULT([Yes])
      mobile_app=true;
+     MOBILEAPP=1
 else
      AC_MSG_RESULT([No])
 fi
+AC_DEFINE_UNQUOTED([MOBILEAPP],[$MOBILEAPP],[Define to 1 if this is a mobileapp (eg. Android) build.])
 
 ENABLE_SSL=true
 if test "$enable_ssl" != "no" -a "$mobile_app" != "true"; then
diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index 87272afdd..5b9ac3b42 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -137,8 +137,10 @@ using Poco::Net::PartHandler;
 #ifdef MOBILEAPP
 #ifdef IOS
 #include "ios.h"
-#else
+#elif GTKAPP
 #include "gtk.hpp"
+#elif defined(__ANDROID__)
+#include "androidapp.h"
 #endif
 #endif