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

[Stephan Bergmann (via logerrit)]

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

New commits:
commit 69030664ddce60d027888b65fd25e27a5ced2eff
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Fri Aug 30 21:26:14 2019 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Fri Aug 30 23:17:05 2019 +0200

    Blind fix for Android, take two
    
    After 1928ced074260d2d40345bdf4c96767abb99bb4f "Blind fix for Android", tb24
    still fails with
    
    > Linking obj/local/armeabi-v7a/liblo-native-code.so
    > /home/android/lo/master-android-arm/instdir/program/libsofficeapp.a(sofficemain.o):sofficemain.cxx:function soffice_main: error: undefined reference to ´sal_detail_initialize´
    > clang++: error: linker command failed with exit code 1 (use -v to see invocation)
    
    Lets see if including sal/osl/unx/salinit.cxx in ANDROID/iOS builds works (even
    if the contents is not normally used there, including it should be harmless).
    
    Change-Id: Ifa38af8f5217a17d3ac74851b46bdb3b50cd4efd
    Reviewed-on: https://gerrit.libreoffice.org/78325
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk
index 86f2158f039a..6b3931dc4727 100644
--- a/sal/Library_sal.mk
+++ b/sal/Library_sal.mk
@@ -172,6 +172,7 @@ $(eval $(call gb_Library_add_exception_objects,sal,\
 	sal/osl/unx/profile \
 	sal/osl/unx/random \
 	sal/osl/unx/readwrite_helper \
+	sal/osl/unx/salinit \
 	sal/osl/unx/security \
 	sal/osl/unx/signal \
 	sal/osl/unx/socket \
@@ -179,7 +180,6 @@ $(eval $(call gb_Library_add_exception_objects,sal,\
 	sal/osl/unx/tempfile \
 	sal/osl/unx/thread \
 	sal/osl/unx/time \
-	$(if $(filter-out ANDROID iOS,$(OS)), sal/osl/unx/salinit) \
 ))
 
 # Note that the uunxapi.mm file just includes the uunxapi.cxx one. Ditto for system.mm