From 511ae02c6457e69cb6daab871acd9c3e7d64e2e3 Mon Sep 17 00:00:00 2001 From: Gautam Prajapati Date: Fri, 18 Aug 2017 23:17:15 +0530 Subject: 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 Reviewed-by: Miklos Vajna --- vcl/Library_vcl.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'vcl') diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 6b40a48d8783..00cbf3b6a23e 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -56,7 +56,7 @@ $(eval $(call gb_Library_use_custom_headers,vcl,\ )) $(eval $(call gb_Library_use_externals,vcl,\ - $(if $(filter LINUX MACOSX %BSD SOLARIS,$(OS)), \ + $(if $(filter LINUX MACOSX ANDROID %BSD SOLARIS,$(OS)), \ curl) \ jpeg \ libeot \ -- cgit