diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2019-08-30 21:26:14 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2019-08-30 23:17:05 +0200 |
| commit | 69030664ddce60d027888b65fd25e27a5ced2eff (patch) | |
| tree | 9f52471a351f567b9142d012af0a77fc3aa50142 /sal | |
| parent | 934e34ef756a3ece569d2f47a0979b4e6ed67a27 (diff) | |
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@redhat.com>
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/Library_sal.mk | 2 |
1 files changed, 1 insertions, 1 deletions
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 |