diff options
| author | Ying Wang <wangying@google.com> | 2010-02-11 09:39:22 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-02-11 09:39:22 -0800 |
| commit | 4e208bd8722ad48c342c0128313ef40971234121 (patch) | |
| tree | 8ece6469b0a1c6cdb8b4330d65f8c78a5aa0e0ac /data | |
| parent | 5e2c81dca659aaf392e99574f15768caea24c002 (diff) | |
| parent | 1c62afd03cd703c5807bb6104ce8b8b10b881b47 (diff) | |
| download | frameworks_base-4e208bd8722ad48c342c0128313ef40971234121.zip frameworks_base-4e208bd8722ad48c342c0128313ef40971234121.tar.gz frameworks_base-4e208bd8722ad48c342c0128313ef40971234121.tar.bz2 | |
Merge "Support for product specific fallback font file."
Diffstat (limited to 'data')
| -rw-r--r-- | data/fonts/Android.mk | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/data/fonts/Android.mk b/data/fonts/Android.mk index 597cb57..b7491b2 100644 --- a/data/fonts/Android.mk +++ b/data/fonts/Android.mk @@ -26,14 +26,11 @@ copy_from := \ Clockopia.ttf ifneq ($(NO_FALLBACK_FONT),true) +ifeq ($(filter %system/fonts/DroidSansFallback.ttf,$(PRODUCT_COPY_FILES)),) + # if the product makefile has set the the fallback font, don't override it. copy_from += DroidSansFallback.ttf endif +endif -copy_to := $(addprefix $(TARGET_OUT)/fonts/,$(copy_from)) - -$(copy_to) : PRIVATE_MODULE := fonts -$(copy_to) : $(TARGET_OUT)/fonts/% : $(LOCAL_PATH)/% | $(ACP) - $(transform-prebuilt-to-target) - -ALL_PREBUILT += $(copy_to) - +copy_file_pairs := $(foreach cf,$(copy_from),$(LOCAL_PATH)/$(cf):system/fonts/$(cf)) +PRODUCT_COPY_FILES += $(copy_file_pairs) |