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 /svl | |
| 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 'svl')
| -rw-r--r-- | svl/Library_svl.mk | 4 | ||||
| -rw-r--r-- | svl/source/crypto/cryptosign.cxx | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/svl/Library_svl.mk b/svl/Library_svl.mk index c61b0e789f40..de981cdc9315 100644 --- a/svl/Library_svl.mk +++ b/svl/Library_svl.mk @@ -21,7 +21,7 @@ $(eval $(call gb_Library_Library,svl)) $(eval $(call gb_Library_use_externals,svl,\ boost_headers \ - $(if $(filter LINUX MACOSX %BSD SOLARIS,$(OS)), \ + $(if $(filter LINUX MACOSX ANDROID %BSD SOLARIS,$(OS)), \ curl) \ icu_headers \ icuuc \ @@ -103,7 +103,7 @@ $(eval $(call gb_Library_use_system_win32_libs,svl,\ crypt32 \ )) else -ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) +ifneq (,$(filter DESKTOP,$(BUILD_TYPE))$(filter ANDROID,$(OS))) $(eval $(call gb_Library_add_defs,svl,\ -DSVL_CRYPTO_NSS \ )) diff --git a/svl/source/crypto/cryptosign.cxx b/svl/source/crypto/cryptosign.cxx index 1e0712fd8850..dab47be4e5cc 100644 --- a/svl/source/crypto/cryptosign.cxx +++ b/svl/source/crypto/cryptosign.cxx @@ -252,6 +252,9 @@ const SEC_ASN1Template IssuerSerialTemplate[] = * issuerSerial IssuerSerial OPTIONAL * } */ + +SEC_ASN1_MKSUB(SECOID_AlgorithmIDTemplate) + const SEC_ASN1Template ESSCertIDv2Template[] = { {SEC_ASN1_SEQUENCE, 0, nullptr, sizeof(ESSCertIDv2)}, |