From 8e359817da14f6a4ffcf3bf4f7a59bc4fef8c211 Mon Sep 17 00:00:00 2001 From: Ying Wang Date: Thu, 6 Oct 2011 11:14:13 -0700 Subject: [PATCH] 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 --- CleanSpec.mk | 1 + data/fonts/Android.mk | 76 ++++++++++++++++++++++++++++--------------- 2 files changed, 50 insertions(+), 27 deletions(-) diff --git a/CleanSpec.mk b/CleanSpec.mk index 1c8527916651a..9381437f5dd05 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -115,6 +115,7 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/fonts/Lohit_Hindi.ttf) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/media/audio/) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/fonts/DroidSans*) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/media/audio/) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/fonts/DroidSans*) # ************************************************ # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST # ************************************************ diff --git a/data/fonts/Android.mk b/data/fonts/Android.mk index db27cdcfac7af..02d2f3d79217a 100644 --- a/data/fonts/Android.mk +++ b/data/fonts/Android.mk @@ -17,13 +17,56 @@ LOCAL_PATH := $(call my-dir) +########################################## +# We may only afford small font footprint. +########################################## +# Use only symlinks. +# Symlink: DroidSans.ttf -> Roboto-Regular.ttf +LOCAL_MODULE := DroidSans.ttf +font_symlink_src := $(PRODUCT_OUT)/system/fonts/Roboto-Regular.ttf +font_symlink := $(dir $(font_symlink_src))$(LOCAL_MODULE) +$(font_symlink) : $(font_symlink_src) + @echo "Symlink: $@ -> $<" + @mkdir -p $(dir $@) + @rm -rf $@ + $(hide) ln -sf $(notdir $<) $@ + +# this magic makes LOCAL_REQUIRED_MODULES work +ALL_MODULES.$(LOCAL_MODULE).INSTALLED := \ + $(ALL_MODULES.$(LOCAL_MODULE).INSTALLED) $(font_symlink) + +################################ +# Symlink: DroidSans-Bold.ttf -> Roboto-Bold.ttf +LOCAL_MODULE := DroidSans-Bold.ttf +font_symlink_src := $(PRODUCT_OUT)/system/fonts/Roboto-Bold.ttf +font_symlink := $(dir $(font_symlink_src))$(LOCAL_MODULE) +$(font_symlink) : $(font_symlink_src) + @echo "Symlink: $@ -> $<" + @mkdir -p $(dir $@) + @rm -rf $@ + $(hide) ln -sf $(notdir $<) $@ + +# this magic makes LOCAL_REQUIRED_MODULES work +ALL_MODULES.$(LOCAL_MODULE).INSTALLED := \ + $(ALL_MODULES.$(LOCAL_MODULE).INSTALLED) $(font_symlink) + +################################ +include $(CLEAR_VARS) +LOCAL_MODULE := DroidSansEthiopic-Regular.ttf +LOCAL_SRC_FILES := $(LOCAL_MODULE) +LOCAL_MODULE_CLASS := ETC +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_PATH := $(TARGET_OUT)/fonts +include $(BUILD_PREBUILT) + +################################ ifeq ($(SMALLER_FONT_FOOTPRINT),true) droidsans_fallback_src := DroidSansFallback.ttf -extra_droidsans_fonts := +extra_droidsans_fonts := DroidSans.ttf DroidSans-Bold.ttf else droidsans_fallback_src := DroidSansFallbackFull.ttf extra_droidsans_fonts := DroidSans.ttf DroidSans-Bold.ttf DroidSansEthiopic-Regular.ttf -endif +endif # SMALLER_FONT_FOOTPRINT include $(CLEAR_VARS) LOCAL_MODULE := DroidSansFallback.ttf @@ -32,30 +75,9 @@ LOCAL_MODULE_CLASS := ETC LOCAL_MODULE_TAGS := optional LOCAL_MODULE_PATH := $(TARGET_OUT)/fonts LOCAL_REQUIRED_MODULES := $(extra_droidsans_fonts) +include $(BUILD_PREBUILT) + +font_symlink_src := +font_symlink := droidsans_fallback_src := extra_droidsans_fonts := -include $(BUILD_PREBUILT) - -include $(CLEAR_VARS) -LOCAL_MODULE := DroidSans.ttf -LOCAL_SRC_FILES := $(LOCAL_MODULE) -LOCAL_MODULE_CLASS := ETC -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_PATH := $(TARGET_OUT)/fonts -include $(BUILD_PREBUILT) - -include $(CLEAR_VARS) -LOCAL_MODULE := DroidSans-Bold.ttf -LOCAL_SRC_FILES := $(LOCAL_MODULE) -LOCAL_MODULE_CLASS := ETC -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_PATH := $(TARGET_OUT)/fonts -include $(BUILD_PREBUILT) - -include $(CLEAR_VARS) -LOCAL_MODULE := DroidSansEthiopic-Regular.ttf -LOCAL_SRC_FILES := $(LOCAL_MODULE) -LOCAL_MODULE_CLASS := ETC -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_PATH := $(TARGET_OUT)/fonts -include $(BUILD_PREBUILT)