Android: Enable HAVE_FEATURE_NSS and package the NSS libraries with apk

Desktop / LibreOffice - Gautam Prajapati [gmail.com] - 23 August 2017 11:50 UTC

This commit enables HAVE_FEATURE_NSS for Android and fixes the svl/ vcl/ and xmlsecurity/ module to use NSS.

xmlsecurity/ wasn't built for Android previously, this commit enables building xmlsecurity/ for Android and disables the support of gpgme in the same module(Only for Android).

It also enables the linking of NSS shared libraries with liblo-native-code.so and adds a rule to package them along with the apk.

Change-Id: I7d0341688ac979ae92e9145c37dd107670417fe1 Reviewed-on: https://gerrit.libreoffice.org/41308

511ae02 Android: Enable HAVE_FEATURE_NSS and package the NSS libraries with apk
RepositoryExternal.mk | 8 --------
android/Bootstrap/Makefile.shared | 20 +++++++++++++++++++-
bin/lo-all-static-libs | 2 ++
configure.ac | 2 +-
svl/Library_svl.mk | 4 ++--
svl/source/crypto/cryptosign.cxx | 3 +++
vcl/Library_vcl.mk | 2 +-
xmlsecurity/Library_xmlsecurity.mk | 2 +-
xmlsecurity/Library_xsec_xmlsec.mk | 9 ---------
xmlsecurity/Module_xmlsecurity.mk | 2 --
.../source/helper/documentsignaturemanager.cxx | 4 ++--
xmlsecurity/source/helper/xsecctl.cxx | 4 ++--
xmlsecurity/source/helper/xsecverify.cxx | 2 +-
xmlsecurity/source/xmlsec/xsec_xmlsec.cxx | 4 ++--
14 files changed, 36 insertions(+), 32 deletions(-)

Upstream: cgit.freedesktop.org


  • Share