[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - 2 commits - desktop/source external/graphite

[Jan Holesovsky (via logerrit)]

 desktop/source/lib/init.cxx                 |    9 +++++++++
 external/graphite/StaticLibrary_graphite.mk |    9 +++++++++
 2 files changed, 18 insertions(+)

New commits:
commit 7bef173a057372ea1b51f7358fc7df439e59a10f
Author:     Jan Holesovsky <kendy at collabora.com>
AuthorDate: Thu Apr 11 21:17:43 2019 +0200
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Wed Oct 9 10:38:33 2019 +0200

    graphite: Force optimization on Android.
    
    The Pass.cpp triggers an infinite loop in clang when not optimizing (ie.
    with the debugging buildls), at least with this version:
    
      > ~/Android/Sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/bin/clang++ --version
      Android (5058415 based on r339409) clang version 8.0.2 (https://android.googlesource.com/toolchain/clang 40173bab62ec746213857d083c0e8b0abb568790) (https://android.googlesource.com/toolchain/llvm 7a6618d69e7e8111e1d49dc9e7813767c5ca756a) (based on LLVM 8.0.2svn)
      Target: x86_64-unknown-linux-gnu
      Thread model: posix
      InstalledDir: /local/home/kendy/Android/Sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/bin
    
    Change-Id: Ib4984f8838fc733be6da4e24eb10915d3efbf79e
    Reviewed-on: https://gerrit.libreoffice.org/80272
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/external/graphite/StaticLibrary_graphite.mk b/external/graphite/StaticLibrary_graphite.mk
index 8c16482ba11b..75d1fe84071b 100644
--- a/external/graphite/StaticLibrary_graphite.mk
+++ b/external/graphite/StaticLibrary_graphite.mk
@@ -32,6 +32,15 @@ $(eval $(call gb_StaticLibrary_add_cxxflags,graphite,\
 endif
 endif
 
+ifeq ($(OS),ANDROID)
+# Force optimizations on Android, because otherwise Pass.cpp triggers an
+# infinite loop in clang, at least in this version:
+# Android (5058415 based on r339409) clang version 8.0.2 (https://android.googlesource.com/toolchain/clang 40173bab62ec746213857d083c0e8b0abb568790) (https://android.googlesource.com/toolchain/llvm 7a6618d69e7e8111e1d49dc9e7813767c5ca756a) (based on LLVM 8.0.2svn)
+$(eval $(call gb_StaticLibrary_add_cxxflags,graphite,\
+     -Os \
+))
+endif
+
 $(eval $(call gb_StaticLibrary_set_generated_cxx_suffix,graphite,cpp))
 
 $(eval $(call gb_StaticLibrary_add_generated_exception_objects,graphite,\
commit bc5525eb71cbbdadf7c65fdd935e29c1cb83e384
Author:     Jan Holesovsky <kendy at collabora.com>
AuthorDate: Fri Feb 15 16:04:51 2019 +0100
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Wed Oct 9 10:38:14 2019 +0200

    android: Set the program path sensibly when we've got nullptr.
    
    Change-Id: I4415459ca5d758d06d866faeca85e1cf154d0567
    Reviewed-on: https://gerrit.libreoffice.org/67877
    Tested-by: Jenkins
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/80271
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 5fafd6c2a25a..aadafe279a43 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -24,6 +24,10 @@
 #include <postmac.h>
 #endif
 
+#ifdef ANDROID
+#include <osl/detail/android-bootstrap.h>
+#endif
+
 #include <algorithm>
 #include <memory>
 #include <iostream>
@@ -5423,11 +5427,16 @@ static int lo_initialize(LibreOfficeKit* pThis, const char* pAppPath, const char
     }
     else
     {
+#ifdef ANDROID
+        aAppPath = OUString::fromUtf8(lo_get_app_data_dir()) + "/program";
+#else
         // Fun conversion dance back and forth between URLs and system paths...
         OUString aAppURL;
         ::osl::Module::getUrlFromAddress( reinterpret_cast< oslGenericFunction >(lo_initialize),
                                           aAppURL);
         osl::FileBase::getSystemPathFromFileURL( aAppURL, aAppPath );
+#endif
+
 #ifdef IOS
         // The above gives something like
         // "/private/var/containers/Bundle/Application/953AA851-CC15-4C60-A2CB-C2C6F24E6F71/Foo.app/Foo",