[Libreoffice-commits] core.git: sal/Library_sal.mk

Caolán McNamara caolanm at redhat.com
Tue Dec 20 16:07:14 UTC 2016


 sal/Library_sal.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c4b7d96f390026b505881955a428a9df18093803
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Dec 20 16:05:51 2016 +0000

    keep salinit for non-DESKTOP but not for ANDROID/IOS
    
    Change-Id: I6b97345c9d927d1ae1d89f85611c2b5de7b5f0d4

diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk
index b3a863a..87b0acb 100644
--- a/sal/Library_sal.mk
+++ b/sal/Library_sal.mk
@@ -180,7 +180,7 @@ $(eval $(call gb_Library_add_exception_objects,sal,\
 	sal/osl/unx/tempfile \
 	sal/osl/unx/thread \
 	sal/osl/unx/time \
-	sal/osl/unx/salinit \
+	$(if $(filter-out ANDROID IOS,$(OS)), sal/osl/unx/salinit) \
 ))
 
 # Note that the uunxapi.mm file just includes the uunxapi.cxx one


More information about the Libreoffice-commits mailing list