android/Bootstrap/Makefile.shared | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit de3d5c9d394bd8ed10670800a3814edb3db3c31d
Author: Jan Holesovsky <ke...@collabora.com>
AuthorDate: Fri Oct 25 07:42:30 2019 +0200
Commit: Jan Holesovsky <ke...@collabora.com>
CommitDate: Fri Oct 25 08:30:09 2019 +0200
android: Fix problems with unwinding in the Online-based Android app.
This partially reverts a7f6338875931d8afff55cb39ead8f6600af04cb. The
problem is that with that approach, the problems with unwinding as
described in 312eeeee42cb4a1e356943e17305555e41afc4ef were plaguing the
Online-based Android app, leading to mysterious crashes with stack
traces like:
#00 pc 0005f2b6 /apex/com.android.runtime/lib/bionic/libc.so (abort+166)
(BuildId: 68c87e04526a60689ecb5deb329804a0)
#01 pc 05caaae7
/data/app/libreoffice.debug-fBEOIUwPHY3_k3eQid159Q==/lib/arm/liblo-native-code.so
(BuildId: 1c3d0e6336ddfc3578e1c186944160252a750b8b)
...
#06 pc 07452e43
/data/app/libreoffice.debug-fBEOIUwPHY3_k3eQid159Q==/lib/arm/liblo-native-code.so
(BuildId: 1c3d0e6336ddfc3578e1c186944160252a750b8b)
#07 pc 0005a37c /apex/com.android.runtime/lib/bionic/libc.so
(__restore_rt) (BuildId: 68c87e04526a60689ecb5deb329804a0)
#08 pc 0005f2b2 /apex/com.android.runtime/lib/bionic/libc.so (abort+162)
(BuildId: 68c87e04526a60689ecb5deb329804a0)
#09 pc 07565d3b
/data/app/libreoffice.debug-fBEOIUwPHY3_k3eQid159Q==/lib/arm/liblo-native-code.so
(BuildId: 1c3d0e6336ddfc3578e1c186944160252a750b8b)
...
#11 pc 07565641
/data/app/libreoffice.debug-fBEOIUwPHY3_k3eQid159Q==/lib/arm/liblo-native-code.so
(BuildId: 1c3d0e6336ddfc3578e1c186944160252a750b8b)
#12 pc 0001e394 /apex/com.android.runtime/lib/bionic/libm.so
(__gnu_Unwind_RaiseException+108) (BuildId: 0ee3a75927e0da4fa0fe29469ccf8b39)
#13 pc 0001eee8 /apex/com.android.runtime/lib/bionic/libm.so
(_Unwind_RaiseException+20) (BuildId: 0ee3a75927e0da4fa0fe29469ccf8b39)
Change-Id: Ie4e7b20380c9104770229a8d30036ad76093283d
Reviewed-on: https://gerrit.libreoffice.org/81484
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Jan Holesovsky <ke...@collabora.com>
diff --git a/android/Bootstrap/Makefile.shared
b/android/Bootstrap/Makefile.shared
index 0be8e1e14250..942f5f8179ee 100644
--- a/android/Bootstrap/Makefile.shared
+++ b/android/Bootstrap/Makefile.shared
@@ -59,7 +59,7 @@ WHOLELIBS = \
$(OBJLOCAL)/liblo-native-code.so : native-code.cxx $(ALL_STATIC_LIBS)
@echo "Linking $@"
mkdir -p $(OBJLOCAL)
- $(CXX) -Wl,--build-id=sha1 -Wl,--gc-sections
-Wl,--version-script=../Bootstrap/version.map -Wl,--no-keep-files-mapped
-Wl,--no-undefined -DANDROID -DDISABLE_DYNLOADING -shared
-Wl,-soname,liblo-native-code.so -o $(OBJLOCAL)/liblo-native-code.so
-I$(BUILDDIR)/config_host -I$(SRCDIR)/include native-code.cxx
-L$(INSTDIR)/$(LIBO_LIB_FOLDER) $(WHOLELIBS) $(LIBS) -static-libstdc++
$(addprefix -l,$(NSSLIBS)) -lGLESv2 -landroid -ljnigraphics -llog -lz
+ $(CXX) -Wl,--build-id=sha1 -Wl,--gc-sections
-Wl,--version-script=../Bootstrap/version.map -Wl,--no-keep-files-mapped
-Wl,--no-undefined -DANDROID -DDISABLE_DYNLOADING -shared
-Wl,-soname,liblo-native-code.so -o $(OBJLOCAL)/liblo-native-code.so
-I$(BUILDDIR)/config_host -I$(SRCDIR)/include native-code.cxx
-L$(INSTDIR)/$(LIBO_LIB_FOLDER) $(WHOLELIBS) $(LIBS) -lc++_static -lc++abi
-landroid_support $(if $(filter armeabi-v7a,$(ANDROID_APP_ABI)),-lunwind)
$(addprefix -l,$(NSSLIBS)) -lGLESv2 -landroid -ljnigraphics -llog -lz
$(SODEST)/liblo-native-code.so : $(OBJLOCAL)/liblo-native-code.so
mkdir -p $(SODEST)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
