From 1c62afd03cd703c5807bb6104ce8b8b10b881b47 Mon Sep 17 00:00:00 2001
From: Ying Wang <wangying@google.com>
Date: Mon, 8 Feb 2010 16:52:49 -0800
Subject: Support for product specific fallback font file.

---
 data/fonts/Android.mk | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

(limited to 'data/fonts')

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)
-- 
cgit v1.1