Skip to content

Commit 0876101

Browse files
author
Keun young Park
committed
add MINIMAL_FONT_FOOTPRINT configuration for PDK
- all non-latin fonts excluded - symlink used to create additional fonts Bug: 6540216 Change-Id: Id0909124dc1d71331bde3c5911c24eee5b1692a2
1 parent da741b4 commit 0876101

File tree

1 file changed

+41
-40
lines changed

1 file changed

+41
-40
lines changed

data/fonts/Android.mk

Lines changed: 41 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -18,37 +18,25 @@
1818
LOCAL_PATH := $(call my-dir)
1919

2020
##########################################
21-
# We may only afford small font footprint.
22-
##########################################
23-
# Use only symlinks.
24-
# Symlink: DroidSans.ttf -> Roboto-Regular.ttf
25-
LOCAL_MODULE := DroidSans.ttf
26-
font_symlink_src := $(PRODUCT_OUT)/system/fonts/Roboto-Regular.ttf
27-
font_symlink := $(dir $(font_symlink_src))$(LOCAL_MODULE)
28-
$(font_symlink) : $(font_symlink_src)
29-
@echo "Symlink: $@ -> $<"
30-
@mkdir -p $(dir $@)
31-
@rm -rf $@
32-
$(hide) ln -sf $(notdir $<) $@
33-
21+
# create symlink for given font
22+
# $(1): new font $(2): link target
23+
# should be used with eval: $(eval $(call ...))
24+
define create-font-symlink
25+
$(PRODUCT_OUT)/system/fonts/$(1) : $(PRODUCT_OUT)/system/fonts/$(2)
26+
@echo "Symlink: $$@ -> $$<"
27+
@mkdir -p $$(dir $$@)
28+
@rm -rf $$@
29+
$(hide) ln -sf $$(notdir $$<) $$@
3430
# this magic makes LOCAL_REQUIRED_MODULES work
35-
ALL_MODULES.$(LOCAL_MODULE).INSTALLED := \
36-
$(ALL_MODULES.$(LOCAL_MODULE).INSTALLED) $(font_symlink)
37-
38-
################################
39-
# Symlink: DroidSans-Bold.ttf -> Roboto-Bold.ttf
40-
LOCAL_MODULE := DroidSans-Bold.ttf
41-
font_symlink_src := $(PRODUCT_OUT)/system/fonts/Roboto-Bold.ttf
42-
font_symlink := $(dir $(font_symlink_src))$(LOCAL_MODULE)
43-
$(font_symlink) : $(font_symlink_src)
44-
@echo "Symlink: $@ -> $<"
45-
@mkdir -p $(dir $@)
46-
@rm -rf $@
47-
$(hide) ln -sf $(notdir $<) $@
31+
ALL_MODULES.$(1).INSTALLED := \
32+
$(ALL_MODULES.$(1).INSTALLED) $(PRODUCT_OUT)/system/fonts/$(1)
33+
endef
4834

49-
# this magic makes LOCAL_REQUIRED_MODULES work
50-
ALL_MODULES.$(LOCAL_MODULE).INSTALLED := \
51-
$(ALL_MODULES.$(LOCAL_MODULE).INSTALLED) $(font_symlink)
35+
##########################################
36+
# We may only afford small font footprint.
37+
##########################################
38+
$(eval $(call create-font-symlink,DroidSans.ttf,Roboto-Regular.ttf))
39+
$(eval $(call create-font-symlink,DroidSans-Bold.ttf,Roboto-Bold.ttf))
5240

5341
################################
5442
# On space-constrained devices, we include a subset of fonts:
@@ -121,7 +109,6 @@ font_symlink_src :=
121109
font_symlink :=
122110
droidsans_fallback_src :=
123111
extra_font_files :=
124-
125112
################################
126113
# Build the rest font files as prebuilt.
127114

@@ -142,6 +129,27 @@ font_src_files := \
142129
Roboto-Bold.ttf \
143130
Roboto-Italic.ttf \
144131
Roboto-BoldItalic.ttf \
132+
DroidSerif-Regular.ttf \
133+
DroidSerif-Bold.ttf \
134+
DroidSerif-Italic.ttf \
135+
DroidSerif-BoldItalic.ttf \
136+
DroidSansMono.ttf \
137+
Clockopia.ttf \
138+
AndroidClock.ttf \
139+
AndroidClock_Highlight.ttf \
140+
AndroidClock_Solid.ttf
141+
142+
ifeq ($(MINIMAL_FONT_FOOTPRINT),true)
143+
144+
$(eval $(call create-font-symlink,Roboto-Light.ttf,Roboto-Regular.ttf))
145+
$(eval $(call create-font-symlink,Roboto-LightItalic.ttf,Roboto-Italic.ttf))
146+
$(eval $(call create-font-symlink,RobotoCondensed-Regular.ttf,Roboto-Regular.ttf))
147+
$(eval $(call create-font-symlink,RobotoCondensed-Bold.ttf,Roboto-Bold.ttf))
148+
$(eval $(call create-font-symlink,RobotoCondensed-Italic.ttf,Roboto-Italic.ttf))
149+
$(eval $(call create-font-symlink,RobotoCondensed-BoldItalic.ttf,Roboto-BoldItalic.ttf))
150+
151+
else # !MINIMAL_FONT
152+
font_src_files += \
145153
Roboto-Light.ttf \
146154
Roboto-LightItalic.ttf \
147155
RobotoCondensed-Regular.ttf \
@@ -154,18 +162,11 @@ font_src_files := \
154162
DroidSansHebrew-Regular.ttf \
155163
DroidSansHebrew-Bold.ttf \
156164
DroidSansThai.ttf \
157-
DroidSerif-Regular.ttf \
158-
DroidSerif-Bold.ttf \
159-
DroidSerif-Italic.ttf \
160-
DroidSerif-BoldItalic.ttf \
161-
DroidSansMono.ttf \
162165
DroidSansArmenian.ttf \
163166
DroidSansGeorgian.ttf \
164-
AndroidEmoji.ttf \
165-
Clockopia.ttf \
166-
AndroidClock.ttf \
167-
AndroidClock_Highlight.ttf \
168-
AndroidClock_Solid.ttf \
167+
AndroidEmoji.ttf
168+
169+
endif # !MINIMAL_FONT
169170

170171
$(foreach f, $(font_src_files), $(call build-one-font-module, $(f)))
171172

0 commit comments

Comments
 (0)