android/Bootstrap/Makefile.shared | 1 +
1 file changed, 1 insertion(+)
New commits:
commit 095b2da8c04dc68a364660fc593097d5d7b1fa99
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Thu Nov 19 08:44:33 2020 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Thu Nov 19 11:50:31 2020 +0100
Make sure $(SODEST)/libc++_shared.so target dir exists
...similar to how this is done for the other $(SODEST)/... targets above
(and
which has presumably been missing accidentally from
eb050ae015300e850553f71b4ebbd80f40f4c3f3 "tdf#123290 fix android tinderbox
builds/properly package libc++_shared.so".
Saw <https://ci.libreoffice.org/job/gerrit_android_x86/830/> fail once with
> cp: cannot create regular file
‘/home/tdf/lode/jenkins/workspace/android_x86/android/jniLibs/x86/libc++_shared.so’:
No such file or directory
> ../Bootstrap/Makefile.shared:75: recipe for target
'/home/tdf/lode/jenkins/workspace/android_x86/android/jniLibs/x86/libc++_shared.so'
failed
> make[2]: ***
[/home/tdf/lode/jenkins/workspace/android_x86/android/jniLibs/x86/libc++_shared.so]
Error 1
> make[2]: *** Waiting for unfinished jobs....
>
/home/tdf/lode/jenkins/workspace/android_x86/android/CustomTarget_lo_android.mk:17:
recipe for target
'/home/tdf/lode/jenkins/workspace/android_x86/workdir/CustomTarget/android/source/done'
failed
> make[1]: ***
[/home/tdf/lode/jenkins/workspace/android_x86/workdir/CustomTarget/android/source/done]
Error 2
Change-Id: Ief6b6274ad789d441c2692b941ba0aa8df276e40
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106119
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/android/Bootstrap/Makefile.shared
b/android/Bootstrap/Makefile.shared
index 1b158439f351..f40693615f0a 100644
--- a/android/Bootstrap/Makefile.shared
+++ b/android/Bootstrap/Makefile.shared
@@ -72,6 +72,7 @@ $(SODEST)/nss-libraries :
$(foreach lib,$(NSSLIBS),$(STRIP) -o $(SODEST)/lib$(lib).so
$(INSTDIR)/$(LIBO_LIB_FOLDER)/lib$(lib).so;)
$(SODEST)/libc++_shared.so :
$(ANDROID_NDK_HOME)/sources/cxx-stl/llvm-libc++/libs/$(ANDROID_APP_ABI)/libc++_shared.so
+ mkdir -p $(SODEST)
cp $< $@
link-so: $(SODEST)/liblo-native-code.so $(SODEST)/nss-libraries
$(SODEST)/libc++_shared.so
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
