diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2014-08-13 11:39:51 -0700 |
|---|---|---|
| committer | Deepanshu Gupta <deepanshu@google.com> | 2014-08-14 19:23:01 -0700 |
| commit | f0adf87d42a6c536330d62b7fed407ad773bcf9e (patch) | |
| tree | 3d778c1a8faa686e0e36f79fbe92a9e04acc1217 /core/sdk_font.mk | |
| parent | ad876835c4343a7c499d09bd90b9e79634b972e4 (diff) | |
| download | build-f0adf87d42a6c536330d62b7fed407ad773bcf9e.zip build-f0adf87d42a6c536330d62b7fed407ad773bcf9e.tar.gz build-f0adf87d42a6c536330d62b7fed407ad773bcf9e.tar.bz2 | |
Skip extra fonts if not an extended font build.
This fixes build warning:
build/core/sdk_font.mk:51: warning: overriding commands for target
`out/host/common/obj/PACKAGING/sdk-fonts_intermediates/NanumGothic.ttf'
Change-Id: I5e208faf25f6f5d1ae3fac9970c70e80e42c7dcd
Diffstat (limited to 'core/sdk_font.mk')
| -rw-r--r-- | core/sdk_font.mk | 35 |
1 files changed, 20 insertions, 15 deletions
diff --git a/core/sdk_font.mk b/core/sdk_font.mk index aa6b94d..59aed8b 100644 --- a/core/sdk_font.mk +++ b/core/sdk_font.mk @@ -41,21 +41,26 @@ $(sdk_fonts_device): $(SDK_FONT_TEMP)/%.ttf: $(TARGET_OUT)/fonts/%.ttf \ $(hide) mkdir -p $(dir $@) $(hide) $(call sdk_rename_font,$<,$@) -# Extra fonts that are not part of the device build. These are used as a -# replacement for the OpenType fonts. -sdk_fonts_extra := NanumGothic.ttf DroidSansFallback.ttf -sdk_fonts_extra := $(addprefix $(SDK_FONT_TEMP)/, $(sdk_fonts_extra)) +# List of all dependencies - all fonts and configuration files. +SDK_FONT_DEPS := $(sdk_fonts_device) $(sdk_font_config) -$(SDK_FONT_TEMP)/NanumGothic.ttf: external/naver-fonts/NanumGothic.ttf \ - $(sdk_font_rename_script) - $(hide) mkdir -p $(dir $@) - $(hide) $(call sdk_rename_font,$<,$@) +# Define a macro to create rule for addititional fonts that we want to include +# in the SDK. +# $1 Output font name +# $2 Source font path +define sdk-extra-font-rule +fontfullname := $$(SDK_FONT_TEMP)/$1 +ifeq ($$(filter $(fontfullname),$$(sdk_fonts_device)),) +SDK_FONT_DEPS += $$(fontfullname) +$$(fontfullname): $2 $(sdk_font_rename_script) + $$(hide) mkdir -p $$(dir $$@) + $$(hide) $$(call sdk_rename_font,$$<,$$@) +endif +fontfullname := +endef -$(SDK_FONT_TEMP)/DroidSansFallback.ttf: frameworks/base/data/fonts/DroidSansFallbackFull.ttf \ - $(sdk_font_rename_script) - $(hide) mkdir -p $(dir $@) - $(hide) $(call sdk_rename_font,$<,$@) - -# List of all dependencies - all fonts and configuration files. -SDK_FONT_DEPS := $(sdk_fonts_device) $(sdk_fonts_extra) $(sdk_font_config) +# These extra fonts are used as a replacement for OpenType fonts. +$(eval $(call sdk-extra-font-rule,NanumGothic.ttf,external/naver-fonts/NanumGothic.ttf)) +$(eval $(call sdk-extra-font-rule,DroidSansFallback.ttf,frameworks/base/data/fonts/DroidSansFallbackFull.ttf)) +sdk-extra-font-rule := |