[Libreoffice-commits] core.git: desktop/source include/vcl RepositoryExternal.mk vcl/Library_vcl.mk

[Miklos Vajna]

 RepositoryExternal.mk                  |    2 +-
 desktop/source/app/officeipcthread.cxx |    4 ++--
 include/vcl/outdev.hxx                 |    2 +-
 vcl/Library_vcl.mk                     |    2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 2428e1164b5f38da9fc2f24c5bb478e548f54a6f
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Wed Mar 30 09:08:15 2016 +0200

    Fix Android build
    
    Change-Id: I7247f19b03302b2270e0f6f32c6e6b6e760fd7bd

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 8df085b..af22fe2 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -183,7 +183,7 @@ endef
 
 endif # SYSTEM_CPPUNIT
 
-ifeq ($(ENABLE_OPENGL),TRUE)
+ifeq ($(ENABLE_OPENGL)$(if $(filter ANDROID,$(OS)),TRUE),TRUE)
 ifneq ($(SYSTEM_GLEW),)
 
 define gb_LinkTarget__use_glew
diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx
index 6166138..30b86df 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -53,7 +53,7 @@ using namespace ::com::sun::star::frame;
 
 namespace {
 
-#if HAVE_FEATURE_DESKTOP
+#if HAVE_FEATURE_DESKTOP || defined(ANDROID)
 
 static char const ARGUMENT_PREFIX[] = "InternalIPC::Arguments";
 static char const SEND_ARGUMENTS[] = "InternalIPC::SendArguments";
@@ -100,7 +100,7 @@ namespace desktop
 
 namespace {
 
-#if HAVE_FEATURE_DESKTOP
+#if HAVE_FEATURE_DESKTOP || defined(ANDROID)
 
 class Parser: public CommandLineArgs::Supplier {
 public:
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index 1fb4f9b..9ad1a09 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -613,7 +613,7 @@ public:
      * the underlying SalGraphics and it's implementation
      * changing.
      */
-#if HAVE_FEATURE_OPENGL
+#if HAVE_FEATURE_OPENGL || defined(ANDROID)
     class PaintScope {
         void *pHandle;
     public:
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 0592dd5..1d4cf37 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -120,7 +120,7 @@ $(eval $(call gb_Library_use_externals,vcl,\
 	lcms2 \
 	mdds_headers \
 ))
-ifeq ($(ENABLE_OPENGL),TRUE)
+ifeq ($(ENABLE_OPENGL)$(if $(filter ANDROID,$(OS)),TRUE),TRUE)
 $(eval $(call gb_Library_use_externals,vcl,\
      glew \
  ))