diff options
| author | Ying Wang <wangying@google.com> | 2010-02-08 16:52:49 -0800 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2010-02-09 13:15:10 -0800 |
| commit | 1c62afd03cd703c5807bb6104ce8b8b10b881b47 (patch) | |
| tree | f7dfdaa10538fe6f2ce6239f5361afcefca6f6a6 /data/fonts | |
| parent | 836a1f2cb99600c26a1a928a9e3240b9dec3079b (diff) | |
| download | frameworks_base-1c62afd03cd703c5807bb6104ce8b8b10b881b47.zip frameworks_base-1c62afd03cd703c5807bb6104ce8b8b10b881b47.tar.gz frameworks_base-1c62afd03cd703c5807bb6104ce8b8b10b881b47.tar.bz2 | |
Support for product specific fallback font file.
Diffstat (limited to 'data/fonts')
| -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) |