diff options
| author | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-04-18 13:24:00 +0200 |
|---|---|---|
| committer | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-04-18 13:24:28 +0200 |
| commit | 9b9f1a5f0642a8ccffb67bd53dc18025f99950c7 (patch) | |
| tree | fa36a1c13c987e307716744cc8b028199f4d3965 | |
| parent | 71e71d4b5a9e8f92fc6cdb743d960145600aee46 (diff) | |
Fix android build: fix condition
Change-Id: I5e20375791f038b38ef079712204a1afed07c39c
| -rw-r--r-- | RepositoryExternal.mk | 2 | ||||
| -rw-r--r-- | external/freetype/Module_freetype.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index c9e04fa87ae7..878d4b7b8e3e 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1254,7 +1254,7 @@ endef gb_ExternalProject__use_freetype := -else ifneq (,$(or $(filter-out ANDROID,$(OS)),$(ENABLE_GLTF))) +else ifneq (,$(or $(findstring ANDROID,$(OS)),$(ENABLE_GLTF))) define gb_LinkTarget__use_freetype_headers $(call gb_LinkTarget_use_external_project,$(1),freetype) diff --git a/external/freetype/Module_freetype.mk b/external/freetype/Module_freetype.mk index 9ff2582def01..f6e316d9f8bc 100644 --- a/external/freetype/Module_freetype.mk +++ b/external/freetype/Module_freetype.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Module_Module,freetype)) -ifneq (,$(or $(filter-out ANDROID,$(OS)),$(ENABLE_GLTF))) +ifneq (,$(or $(findstring ANDROID,$(OS)),$(ENABLE_GLTF))) $(eval $(call gb_Module_add_targets,freetype,\ ExternalProject_freetype \ |