[Libreoffice-commits] core.git: desktop/Library_sofficeapp.mk

Andrzej Hunt andrzej.hunt at collabora.com
Wed Jun 25 11:11:11 PDT 2014


 desktop/Library_sofficeapp.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c3db22841c5245587f7fc1e601b5fa21c4e22d8c
Author: Andrzej Hunt <andrzej.hunt at collabora.com>
Date:   Wed Jun 25 15:19:36 2014 +0100

    LOK: can't use basebmp as a library on android.
    
    Change-Id: I84198ac00865991ba845a19c1810dc3f180251ce

diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk
index 870a2db..867e398 100644
--- a/desktop/Library_sofficeapp.mk
+++ b/desktop/Library_sofficeapp.mk
@@ -35,7 +35,7 @@ $(eval $(call gb_Library_add_defs,sofficeapp,\
 $(eval $(call gb_Library_set_precompiled_header,sofficeapp,$(SRCDIR)/desktop/inc/pch/precompiled_sofficeapp))
 
 $(eval $(call gb_Library_use_libraries,sofficeapp,\
-    basebmp \
+    $(if $(filter $(OS),ANDROID),,basebmp) \
     comphelper \
     cppu \
     cppuhelper \


More information about the Libreoffice-commits mailing list