diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-12-16 17:19:39 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-12-16 17:20:12 +0000 |
| commit | d3c06fb90485543f6ca4b1f833e6c4f82b28ba14 (patch) | |
| tree | 436cef0d2817b5292e5658d403f1db6bceb9820d /RepositoryExternal.mk | |
| parent | 62f2a279ed1f50521e185a5bcc1f73fe0782993a (diff) | |
Revert "build our own fontconfig and freetype under oss-fuzz"
did I break android here mysteriously
This reverts commit f2fae3684f35bfb03c4921adc4ecbddcff36374b.
Change-Id: I0d941d3e474c6693cd15e1b55baab83a3da48488
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 3d5c5aa10c88..dcc47a68c47a 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1273,7 +1273,7 @@ endef gb_ExternalProject__use_freetype := -else +else ifeq ($(OS),ANDROID) define gb_LinkTarget__use_freetype_headers $(call gb_LinkTarget_use_external_project,$(1),freetype) @@ -1286,7 +1286,7 @@ endef define gb_LinkTarget__use_freetype $(call gb_LinkTarget_use_external,$(1),freetype_headers) -$(call gb_LinkTarget_add_libs,$(1),-lfreetype) +$(call gb_LinkTarget_add_libs,$(1),$(FREETYPE_LIBS)) endef @@ -1309,7 +1309,7 @@ $(call gb_LinkTarget_add_libs,$(1),$(FONTCONFIG_LIBS)) endef -else +else ifeq ($(OS),ANDROID) define gb_LinkTarget__use_fontconfig $(call gb_LinkTarget_use_external_project,$(1),fontconfig) @@ -1318,8 +1318,6 @@ $(call gb_LinkTarget_set_include,$(1),\ $$(INCLUDE) \ ) -$(call gb_LinkTarget_add_libs,$(1),-lfontconfig) - endef endif # SYSTEM_FONTCONFIG |