[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - android/Bootstrap

2020-06-10 Thread Henry Castro (via logerrit) 
 android/Bootstrap/Makefile.shared |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 4c36cad599add7cefa0af5ca983c81e5b085ffed
Author: Henry Castro 
AuthorDate: Fri Jun 5 08:59:26 2020 -0400
Commit: Henry Castro 
CommitDate: Wed Jun 10 21:15:51 2020 +0200

android: fix the build output directory

When compiling in a different build output directory,
the "liblo-native-code.so" file is created in the source directory and
it fails compiling the "online" project

Change-Id: I4782a69796fb298e9c1a6c4370720b18587735e9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95602
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Henry Castro 

diff --git a/android/Bootstrap/Makefile.shared 
b/android/Bootstrap/Makefile.shared
index 0d7f2581ee3d..e03f4999d477 100644
--- a/android/Bootstrap/Makefile.shared
+++ b/android/Bootstrap/Makefile.shared
@@ -14,8 +14,8 @@
 # configurability on platforms like Android and iOS where apps based on LO
 # code are very much self-contained pre-packaged thingies.
 
-SODEST=jniLibs/$(ANDROID_APP_ABI)
-OBJLOCAL=obj/local/$(ANDROID_APP_ABI)
+SODEST=$(BUILDDIR)/android/jniLibs/$(ANDROID_APP_ABI)
+OBJLOCAL=$(BUILDDIR)/android/obj/local/$(ANDROID_APP_ABI)
 
 #
 # Helpful rules ...
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - android/Bootstrap

2020-06-10 Thread Michael Weghorn (via logerrit) 
 android/Bootstrap/Makefile.shared |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 275c54933c8a2a9efb7c8ec2cbd0fa13a8f4f0de
Author: Michael Weghorn 
AuthorDate: Mon Dec 16 10:46:29 2019 +0100
Commit: Henry Castro 
CommitDate: Wed Jun 10 20:17:25 2020 +0200

android: Fix linking of liblo-native-code.so on x86_64

This is similar to commit c6dadf5035c8e1c31dbd3fccec167bd4a906bf54
("commit android: Fix linking of liblo-native-code.so on aarch64.").

Build previously failed with

Linking obj/local/x86_64/liblo-native-code.so
.../x86_64-linux-android/bin/ld.gold: error: cannot find 
-landroid_support
clang++: error: linker command failed with exit code 1 (use -v to see 
invocation)
make[2]: *** [../Bootstrap/Makefile.shared:62: 
obj/local/x86_64/liblo-native-code.so] Error 1
make[1]: *** [.../android/CustomTarget_lo_android.mk:18: 
.../workdir/CustomTarget/android/source/done] Error 2
make: *** [Makefile:282: build] Error 2

I quickly checked that the app actually runs on an x86_64 AVD
and is able to open and display documents after successfully
building with this commit in place.

Change-Id: I92b3759af6a86a6717c287d035b6a1add3a9af7a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/85204
Tested-by: Jenkins
Reviewed-by: Jan Holesovsky 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95601
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Henry Castro 

diff --git a/android/Bootstrap/Makefile.shared 
b/android/Bootstrap/Makefile.shared
index 8c6270226fe9..0d7f2581ee3d 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) -fuse-ld=gold -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 $(if 
$(filter-out arm64-v8a,$(ANDROID_APP_ABI)),-landroid_support) $(if $(filter 
armeabi-v7a,$(ANDROID_APP_ABI)),-lunwind) $(addprefix -l,$(NSSLIBS)) -lGLESv2 
-landroid -ljnigraphics -llog -lz
+   $(CXX) -fuse-ld=gold -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 $(if 
$(filter-out arm64-v8a x86_64,$(ANDROID_APP_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

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - android/Bootstrap

2019-12-02 Thread Jan Holesovsky (via logerrit) 
 android/Bootstrap/Makefile.shared |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit fa145a035fbab652ec8f3ee870e44e43dd1d770a
Author: Jan Holesovsky 
AuthorDate: Fri Nov 1 17:57:17 2019 +0100
Commit: Jan Holesovsky 
CommitDate: Mon Dec 2 09:13:17 2019 +0100

android: Fix linking of liblo-native-code.so on aarch64.

Forces gold as the linker; but according to the switches that were used,
I suppose gold was used previously anyway, so hopefully not really a
problem.

Change-Id: I7bc54abf0d3b4b3d86d53e4ea6f01146cf196216
Reviewed-on: https://gerrit.libreoffice.org/81905
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/android/Bootstrap/Makefile.shared 
b/android/Bootstrap/Makefile.shared
index 942f5f8179ee..8c6270226fe9 100644
--- a/android/Bootstrap/Makefile.shared
+++ b/android/Bootstrap/Makefile.shared
@@ -51,7 +51,7 @@ NSSLIBS = freebl3 \
 WHOLELIBS = \
   -Wl,--whole-archive \
   $(addprefix -l,$(strip \
-   juh \
+   $(if $(ENABLE_JAVA),juh) \
   )) \
   -Wl,--no-whole-archive
 
@@ -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) -lc++_static -lc++abi 
-landroid_support $(if $(filter armeabi-v7a,$(ANDROID_APP_ABI)),-lunwind) 
$(addprefix -l,$(NSSLIBS)) -lGLESv2 -landroid -ljnigraphics -llog -lz
+   $(CXX) -fuse-ld=gold -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 $(if 
$(filter-out arm64-v8a,$(ANDROID_APP_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

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - android/Bootstrap

2019-10-24 Thread Jan Holesovsky (via logerrit) 
 android/Bootstrap/Makefile.shared |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit de3d5c9d394bd8ed10670800a3814edb3db3c31d
Author: Jan Holesovsky 
AuthorDate: Fri Oct 25 07:42:30 2019 +0200
Commit: Jan Holesovsky 
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 312e42cb4a1e356943e1730e41afc4ef 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 
Reviewed-by: Jan Holesovsky 

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

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - android/Bootstrap configure.ac external/liborcus include/android solenv/gbuild

2019-10-09 Thread Stephan Bergmann (via logerrit) 
 android/Bootstrap/Makefile.shared |2 +-
 configure.ac  |8 
 external/liborcus/UnpackedTarball_liborcus.mk |8 
 external/liborcus/android-workaround.patch|   22 --
 include/android/compatibility.hxx |7 ---
 solenv/gbuild/platform/android.mk |   11 ---
 6 files changed, 1 insertion(+), 57 deletions(-)

New commits:
commit c17f9dccc33b7b09c22c945958e1eda97aa3b201
Author: Stephan Bergmann 
AuthorDate: Tue Dec 11 16:37:43 2018 +0100
Commit: Jan Holesovsky 
CommitDate: Wed Oct 9 10:35:53 2019 +0200

Switch Android armeabi-v7a to libc++/libc++abi/libunwind too

It had been left out in 4082a18406c18af7b4fcef7bd501c3679c3be56b "android: 
use
unified headers and llvm-c++ STL (x86) with NDK 16" because "arm 
unfortunately
crashes with llvm-c++, so keep with gnustl for now/fix that later".

Making armeabi-v7a work with libc++ etc. required a number of changes, 
listed
below, in this commit and in preceding ones.  At least 32-bit x86 already 
worked
with libc++ etc. prior to these changes in view mode, though it crashed in 
the
experimental editing mode (enabled with strippedUIEditing in
android/soruce/Makefile) as soon as one types in something,  But it is not
entirely clear to me why 32-bit x86 view mode didn't also fail similar to 
how I
saw armeabi-v7a fail.  (On 32-bit x86, these changes appear to neither 
improve
nor worsen the current state, view mode still appears to work fine while 
editing
still crashes upon typing anything.  With these changes, editing mode on
armeabi-v7a appears to work fine.  But I tested armeabi-v7a only with a real
device and 32-bit x86 only with an emulator, in case that might make a
difference.)

* Preceding  "Move NSSLIBS to a 
more
  sensible place on the linker command line" plus this change's addition of
  -lunwind to the liblo-native-code.so linker command line make sure that
  liblo-native-code.so uses _Unwind_* functions from libunwind.a, instead of
  erroneously picking up the ones from libgcc.a that happen to be included 
in
  NSSLIB's nspr4 (-lgcc is automatically added to the end of the linker 
command
  line by the invoking compiler, that's how libgcc.a's _Unwind_* end up in
  NSSLIB's nspr4; it is neither clear to me why NSSLIB's nspr4, being a 
pure C
  library, uses _Unwind_* functions, nor why exception handling in
  liblo-native-code.so fails when using _Unwind_* functions from libgcc.a
  instead of from libunwind on armeabi-v7a, nor why that would work on 
32-bit
  x86, but that's what I observed: ModuleManager::identify
  (framework/source/services/modulemanager.cxx) throws a
  css::lang::IllegalArgumentException, which calls __cxa_throw ->
  _Unwind_RaiseException, which ultimately lead to odd misbehavior and
  std::abort during stack unwinding when using _Unwind_RaiseException from
  libgcc.a instead of from libunwind).  (There is no libunwind.* in
  android-ndk-r16b for 32-bit x86 at least, so is presumably using _Unwind_*
  functions from libgcc.a.  It doesn't appear to make a difference if it
  indirectly uses those _Unwind_* functions from NSSLIB's nspr4, or directly
  from libgcc.a included in liblo-native-code.so if the

$(if $(filter armeabi-v7a,$(ANDROID_APP_ABI)),-lunwind)

  had a ",-lgcc" else branch.)

* Preceding  "Export RTTI symbols
  from liblo-native-code.so, for binary UNO bridge" makes sure that 
excpetions
  thrown from the binary UNO bridge can be caught by compiled catch clauses.
  Not sure why the corresponding state of
  bridges/source/cpp_uno/gcc3_linux_intel shouldn't have run into the same
  issue.

* Preceding  "Adapt 
gcc3_linux_arm
  __cxa_exception to NDK 18 libc++abi" makes sure that our version of
  __cxa_exception matches the version from libc++abi.  This is clearly not
  relevant for 32-bit x86.  (The comment there android-ndk-r18b, but the
  additional member is already present in
  android-ndk-r16b/sources/cxx-stl/llvm-libc++abi/src/cxa_exception.hpp, 
too.)

The remainder of this change just drops old armeabi-v7a--specific 
workarounds
that are no longer needed/no longer work.

Change-Id: Ief4c2d562c5032abe6c3b94ca3b3394be6fcd4d3
Reviewed-on: https://gerrit.libreoffice.org/64973
Tested-by: Stephan Bergmann 
Reviewed-by: Stephan Bergmann 
Reviewed-on: https://gerrit.libreoffice.org/80265
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/android/Bootstrap/Makefile.shared 
b/android/Bootstrap/Makefile.shared
index 2e1c8c163bd2..f77679853d39 100644
--- a/android/Bootst

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - android/Bootstrap

2019-10-06 Thread Jan Holesovsky (via logerrit) 
 android/Bootstrap/Makefile.shared |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 21f72fb1dbd0b83ac907e5a64131d41bc364267b
Author: Jan Holesovsky 
AuthorDate: Sat Feb 9 17:34:58 2019 +0100
Commit: Andras Timar 
CommitDate: Sun Oct 6 19:10:25 2019 +0200

android: Add a missing dependency.

Useful when you switch sdk to a different location.

Change-Id: I95301cc9adf50a0bbd918cc7562b8871093625b8
Reviewed-on: https://gerrit.libreoffice.org/67873
Tested-by: Jenkins
Reviewed-by: Jan Holesovsky 

diff --git a/android/Bootstrap/Makefile.shared 
b/android/Bootstrap/Makefile.shared
index 0c9944efff0f..e0678ba8c779 100644
--- a/android/Bootstrap/Makefile.shared
+++ b/android/Bootstrap/Makefile.shared
@@ -21,7 +21,7 @@ OBJLOCAL=obj/local/$(ANDROID_APP_ABI)
 # Helpful rules ...
 #
 
-local.properties:
+local.properties: $(BUILDDIR)/config_host.mk
echo sdk.dir=$(ANDROID_SDK_HOME) >local.properties
 
 #
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits