libxmlsec: stop delivering static and import libraries

... and also check COM instead of CROSS_COMPILING.

Change-Id: I049c9211d4b6eabe4012f66d39d86c7b025dc18c

3 files changed, 20 insertions, 23 deletions

diff --git a/Repository.mk b/Repository.mk
index aaca80a53f56..7e393d454d0b 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -652,12 +652,15 @@ $(eval $(call gb_Helper_register_libraries,EXTENSIONLIBS, \
 ifeq ($(OS),WNT)
 $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
 	xmlsec1 \
-	xmlsec1-nss \
 ))
-ifneq ($(CROSS_COMPILING),YES)
+ifeq ($(COM),MSC)
 $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
 	xmlsec1-mscrypto \
 ))
+else
+$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
+	xmlsec1-nss \
+))
 endif
 endif
 
diff --git a/libxmlsec/ExternalPackage_xmlsec.mk b/libxmlsec/ExternalPackage_xmlsec.mk
index ca438c57a4ab..0655e9716ceb 100644
--- a/libxmlsec/ExternalPackage_xmlsec.mk
+++ b/libxmlsec/ExternalPackage_xmlsec.mk
@@ -13,24 +13,12 @@ $(eval $(call gb_ExternalPackage_use_external_project,xmlsec,xmlsec))
 
 ifeq ($(OS),WNT)
 ifeq ($(COM),GCC)
-$(eval $(call gb_ExternalPackage_add_file,xmlsec,lib/libxmlsec1.dll.a,src/.libs/libxmlsec1.dll.a))
-$(eval $(call gb_ExternalPackage_add_file,xmlsec,lib/libxmlsec1-nss.dll.a,src/nss/.libs/libxmlsec1-nss.dll.a))
 $(eval $(call gb_ExternalPackage_add_library_for_install,xmlsec,lib/libxmlsec1.dll,src/.libs/libxmlsec1.dll))
 $(eval $(call gb_ExternalPackage_add_library_for_install,xmlsec,lib/libxmlsec1-nss.dll,src/nss/.libs/libxmlsec1-nss.dll))
 else
-$(eval $(call gb_ExternalPackage_add_file,xmlsec,lib/libxmlsec-mscrypto.lib,win32/binaries/libxmlsec-mscrypto.lib))
-$(eval $(call gb_ExternalPackage_add_file,xmlsec,lib/libxmlsec.lib,win32/binaries/libxmlsec.lib))
 $(eval $(call gb_ExternalPackage_add_library_for_install,xmlsec,bin/libxmlsec-mscrypto.dll,win32/binaries/libxmlsec-mscrypto.dll))
 $(eval $(call gb_ExternalPackage_add_library_for_install,xmlsec,bin/libxmlsec.dll,win32/binaries/libxmlsec.dll))
 endif
-else ifeq ($(OS),ANDROID)
-$(eval $(call gb_ExternalPackage_add_file,xmlsec,lib/libxmlsec1.a,src/.libs/libxmlsec1.a))
-ifneq ($(DISABLE_OPENSSL),YES)
-$(eval $(call gb_ExternalPackage_add_file,xmlsec,lib/libxmlsec1-openssl.a,src/openssl/.libs/libxmlsec1-openssl.a))
-endif # DISABLE_OPENSSL
-else
-$(eval $(call gb_ExternalPackage_add_file,xmlsec,lib/libxmlsec1.a,src/.libs/libxmlsec1.a))
-$(eval $(call gb_ExternalPackage_add_file,xmlsec,lib/libxmlsec1-nss.a,src/nss/.libs/libxmlsec1-nss.a))
 endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/xmlsecurity/Library_xsec_xmlsec.mk b/xmlsecurity/Library_xsec_xmlsec.mk
index 164bec2a983b..890ffc9dd66c 100644
--- a/xmlsecurity/Library_xsec_xmlsec.mk
+++ b/xmlsecurity/Library_xsec_xmlsec.mk
@@ -70,15 +70,16 @@ $(eval $(call gb_Library_add_exception_objects,xsec_xmlsec,\
 	xmlsecurity/source/xmlsec/nss/xsec_nss \
 ))
 
-ifeq ($(OS)$(CROSS_COMPILING),WNT)
+ifeq ($(OS)-$(COM),WNT-MSC)
 
 $(eval $(call gb_Library_add_defs,xsec_xmlsec,\
 	-DXMLSEC_CRYPTO_MSCRYPTO \
 ))
 
-$(eval $(call gb_Library_use_libraries,xsec_xmlsec,\
-	xmlsec1 \
-	xmlsec1-mscrypto \
+
+$(eval $(call gb_Library_add_libs,xsec_xmlsec,\
+	$(call gb_UnpackedTarball_get_dir,xmlsec)/win32/binaries/libxmlsec-mscrypto.lib \
+	$(call gb_UnpackedTarball_get_dir,xmlsec)/win32/binaries/libxmlsec.lib \
 ))
 
 $(eval $(call gb_Library_use_system_win32_libs,xsec_xmlsec,\
@@ -103,10 +104,15 @@ $(eval $(call gb_Library_add_defs,xsec_xmlsec,\
 	-DXMLSEC_CRYPTO_NSS \
 ))
 
-ifeq ($(OS)$(CROSS_COMPILING),WNTYES)
-$(eval $(call gb_Library_use_libraries,xsec_xmlsec,\
-	xmlsec1 \
-	xmlsec1-nss \
+ifeq ($(OS)-$(COM),WNT-GCC)
+$(eval $(call gb_Library_add_libs,xsec_xmlsec,\
+	$(call gb_UnpackedTarball_get_dir,xmlsec)/src/nss/.libs/libxmlsec1-nss.dll.a \
+	$(call gb_UnpackedTarball_get_dir,xmlsec)/src/.libs/libxmlsec1.dll.a \
+))
+else ifeq ($(OS),ANDROID)
+$(eval $(call gb_Library_add_libs,xsec_xmlsec,\
+	$(call gb_UnpackedTarball_get_dir,xmlsec)/src/openssl/.libs/libxmlsec1-openssl.a \
+	$(call gb_UnpackedTarball_get_dir,xmlsec)/src/.libs/libxmlsec1.a \
 ))
 else
 $(eval $(call gb_Library_add_libs,xsec_xmlsec,\
@@ -130,7 +136,7 @@ $(eval $(call gb_Library_add_exception_objects,xsec_xmlsec,\
 	xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl \
 ))
 
-endif # ifeq ($(OS)$(CROSS_COMPILING),WNT)
+endif # ifeq ($(OS)-$(COM),WNT-GCC)
 
 ifeq ($(OS),SOLARIS)
 $(eval $(call gb_Library_add_libs,xsec_xmlsec,\