diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2013-09-25 10:13:09 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2013-09-25 10:21:22 +0200 |
| commit | fb8d0a4b1313036a2af58ada536ee0171592ebb3 (patch) | |
| tree | 2a70ae1db69b6ad20e66d48b2cee99f0a803bf54 /RepositoryExternal.mk | |
| parent | 58ff5d5f4e694da8b82ff5744af0d815ad9e3e36 (diff) | |
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
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 12 |
1 files changed, 2 insertions, 10 deletions
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 |