android/Bootstrap/Makefile.shared | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit eb050ae015300e850553f71b4ebbd80f40f4c3f3
Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
AuthorDate: Thu Nov 7 14:57:52 2019 +0100
Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
CommitDate: Thu Nov 7 15:06:00 2019 +0100
tdf#123290 fix android tinderbox builds/properly package libc++_shared.so
While it might not be the original problem, at least that is the current
problem the tinderbox provided builds have and should make it work again
Change-Id: Ifaedb3304622286cfe7a6cb49e862a359b53f892
diff --git a/android/Bootstrap/Makefile.shared
b/android/Bootstrap/Makefile.shared
index 942f5f8179ee..7126e9a2f506 100644
--- a/android/Bootstrap/Makefile.shared
+++ b/android/Bootstrap/Makefile.shared
@@ -70,7 +70,10 @@ $(SODEST)/nss-libraries :
mkdir -p $(SODEST)
$(foreach lib,$(NSSLIBS),$(STRIP) -o $(SODEST)/lib$(lib).so
$(INSTDIR)/$(LIBO_LIB_FOLDER)/lib$(lib).so;)
-link-so: $(SODEST)/liblo-native-code.so $(SODEST)/nss-libraries
+$(SODEST)/libc++_shared.so :
$(ANDROID_NDK_HOME)/sources/cxx-stl/llvm-libc++/libs/$(ANDROID_APP_ABI)/libc++_shared.so
+ cp $< $@
+
+link-so: $(SODEST)/liblo-native-code.so $(SODEST)/nss-libraries
$(SODEST)/libc++_shared.so
# If you reinstall an app several times *on the emulator*, even if you
# uninstall it between, disk space seems to leak that won't get recycled until
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
