Skip to content

Commit 8e35981

Browse files
author
Ying Wang
committed
Make symlinks for DroidSans.ttf and DroidSans-Bold.ttf
Bug: 5420351 Make the following symlinks: /system/fonts/DroidSans.ttf -> Roboto-Regular.ttf /system/fonts/DroidSans-Bold.ttf -> Roboto-Bold.ttf Change-Id: If9a74ef4ac2386cdb46d125fed8ce5771e872310
1 parent ad9c571 commit 8e35981

File tree

2 files changed

+50
-27
lines changed

2 files changed

+50
-27
lines changed

CleanSpec.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/fonts/Lohit_Hindi.ttf)
115115
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/media/audio/)
116116
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/fonts/DroidSans*)
117117
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/media/audio/)
118+
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/fonts/DroidSans*)
118119
# ************************************************
119120
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
120121
# ************************************************

data/fonts/Android.mk

Lines changed: 49 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -17,45 +17,67 @@
1717

1818
LOCAL_PATH := $(call my-dir)
1919

20-
ifeq ($(SMALLER_FONT_FOOTPRINT),true)
21-
droidsans_fallback_src := DroidSansFallback.ttf
22-
extra_droidsans_fonts :=
23-
else
24-
droidsans_fallback_src := DroidSansFallbackFull.ttf
25-
extra_droidsans_fonts := DroidSans.ttf DroidSans-Bold.ttf DroidSansEthiopic-Regular.ttf
26-
endif
20+
##########################################
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 $<) $@
2733

28-
include $(CLEAR_VARS)
29-
LOCAL_MODULE := DroidSansFallback.ttf
30-
LOCAL_SRC_FILES := $(droidsans_fallback_src)
31-
LOCAL_MODULE_CLASS := ETC
32-
LOCAL_MODULE_TAGS := optional
33-
LOCAL_MODULE_PATH := $(TARGET_OUT)/fonts
34-
LOCAL_REQUIRED_MODULES := $(extra_droidsans_fonts)
35-
droidsans_fallback_src :=
36-
extra_droidsans_fonts :=
37-
include $(BUILD_PREBUILT)
34+
# this magic makes LOCAL_REQUIRED_MODULES work
35+
ALL_MODULES.$(LOCAL_MODULE).INSTALLED := \
36+
$(ALL_MODULES.$(LOCAL_MODULE).INSTALLED) $(font_symlink)
3837

39-
include $(CLEAR_VARS)
40-
LOCAL_MODULE := DroidSans.ttf
41-
LOCAL_SRC_FILES := $(LOCAL_MODULE)
42-
LOCAL_MODULE_CLASS := ETC
43-
LOCAL_MODULE_TAGS := optional
44-
LOCAL_MODULE_PATH := $(TARGET_OUT)/fonts
45-
include $(BUILD_PREBUILT)
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 $<) $@
48+
49+
# this magic makes LOCAL_REQUIRED_MODULES work
50+
ALL_MODULES.$(LOCAL_MODULE).INSTALLED := \
51+
$(ALL_MODULES.$(LOCAL_MODULE).INSTALLED) $(font_symlink)
4652

53+
################################
4754
include $(CLEAR_VARS)
48-
LOCAL_MODULE := DroidSans-Bold.ttf
55+
LOCAL_MODULE := DroidSansEthiopic-Regular.ttf
4956
LOCAL_SRC_FILES := $(LOCAL_MODULE)
5057
LOCAL_MODULE_CLASS := ETC
5158
LOCAL_MODULE_TAGS := optional
5259
LOCAL_MODULE_PATH := $(TARGET_OUT)/fonts
5360
include $(BUILD_PREBUILT)
5461

62+
################################
63+
ifeq ($(SMALLER_FONT_FOOTPRINT),true)
64+
droidsans_fallback_src := DroidSansFallback.ttf
65+
extra_droidsans_fonts := DroidSans.ttf DroidSans-Bold.ttf
66+
else
67+
droidsans_fallback_src := DroidSansFallbackFull.ttf
68+
extra_droidsans_fonts := DroidSans.ttf DroidSans-Bold.ttf DroidSansEthiopic-Regular.ttf
69+
endif # SMALLER_FONT_FOOTPRINT
70+
5571
include $(CLEAR_VARS)
56-
LOCAL_MODULE := DroidSansEthiopic-Regular.ttf
57-
LOCAL_SRC_FILES := $(LOCAL_MODULE)
72+
LOCAL_MODULE := DroidSansFallback.ttf
73+
LOCAL_SRC_FILES := $(droidsans_fallback_src)
5874
LOCAL_MODULE_CLASS := ETC
5975
LOCAL_MODULE_TAGS := optional
6076
LOCAL_MODULE_PATH := $(TARGET_OUT)/fonts
77+
LOCAL_REQUIRED_MODULES := $(extra_droidsans_fonts)
6178
include $(BUILD_PREBUILT)
79+
80+
font_symlink_src :=
81+
font_symlink :=
82+
droidsans_fallback_src :=
83+
extra_droidsans_fonts :=

0 commit comments

Comments
 (0)