From fb8d0a4b1313036a2af58ada536ee0171592ebb3 Mon Sep 17 00:00:00 2001 From: Matúš Kukan Date: Wed, 25 Sep 2013 10:13:09 +0200 Subject: don't use use_static_libraries for Android It shouldn't be used for external libraries, not built by gbuild, anyway, because it creates wrong dependency. Change-Id: I889dccb1f934caef7f104d479dbe16185b8eeaf4 --- RepositoryExternal.mk | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'RepositoryExternal.mk') diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 0756b4106dac..f072148fee0f 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -976,11 +976,6 @@ else # ANDROID define gb_LinkTarget__use_librdf $(call gb_LinkTarget_use_packages,$(1),raptor rasqal redland) -$(call gb_LinkTarget_use_static_libraries,$(1),\ - rdf \ - rasqal \ - raptor2 \ -) endef @@ -1046,7 +1041,7 @@ $(call gb_LinkTarget_add_libs,$(1),$(FREETYPE_LIBS)) endef -else # ! SYSTEM_FREETYPE +else ifeq ($(OS),ANDROID) define gb_LinkTarget__use_freetype_headers $(call gb_LinkTarget_set_include,$(1),\ @@ -1058,7 +1053,6 @@ endef define gb_LinkTarget__use_freetype $(call gb_LinkTarget_use_external,$(1),freetype_headers) -$(call gb_LinkTarget_use_static_libraries,$(1),freetype) endef @@ -1076,7 +1070,7 @@ $(call gb_LinkTarget_add_libs,$(1),$(FONTCONFIG_LIBS)) endef -else # ! SYSTEM_FONTCONFIG +else ifeq ($(OS),ANDROID) define gb_LinkTarget__use_fontconfig $(call gb_LinkTarget_set_include,$(1),\ @@ -1084,8 +1078,6 @@ $(call gb_LinkTarget_set_include,$(1),\ $$(INCLUDE) \ ) -$(call gb_LinkTarget_use_static_libraries,$(1),fontconfig) - endef endif # SYSTEM_FONTCONFIG -- cgit