diff options
| author | Gautam Prajapati <gautamprajapati06@gmail.com> | 2017-08-18 23:17:15 +0530 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-08-23 17:50:55 +0200 |
| commit | 511ae02c6457e69cb6daab871acd9c3e7d64e2e3 (patch) | |
| tree | b55634866b626b9c8258a902fa78f5ee901eb900 /RepositoryExternal.mk | |
| parent | f8fa4631f35799f1afeec2ecba7eec5bbdba95e5 (diff) | |
Android: Enable HAVE_FEATURE_NSS and package the NSS libraries with apk
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
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 44a89738fb74..d511d51cebcc 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -3268,12 +3268,6 @@ endif # USING_X11 gb_ExternalProject__use_nss3:= -ifeq ($(OS),ANDROID) - -gb_LinkTarget__use_nss3:= -gb_LinkTarget__use_plc4:= - -else ifneq ($(SYSTEM_NSS),) @@ -3369,8 +3363,6 @@ endef endif # SYSTEM_NSS -endif # DESKTOP - ifeq ($(ENABLE_BREAKPAD),TRUE) define gb_LinkTarget__use_breakpad |