Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove font symlinks hack"

Browse Source
This commit is contained in:
Yo Chiang
2020-06-02 10:38:16 +00:00
committed by Gerrit Code Review
parent eee7b45375 5585f04ae6
commit df792ee3f2
2 changed files with 4 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
data/fonts/Android.bp
View File

@@ -16,8 +16,10 @@ prebuilt_font {
name: "DroidSansMono.ttf", name: "DroidSansMono.ttf",
src: "DroidSansMono.ttf", src: "DroidSansMono.ttf",
required: [ required: [
"DroidSans.ttf", // Roboto-Regular.ttf provides DroidSans.ttf as a symlink to itself
"DroidSans-Bold.ttf", "Roboto-Regular.ttf",
// Roboto-Bold.ttf provides DroidSans-Bold.ttf as a symlink to itself
"Roboto-Bold.ttf",
], ],
} }

22
data/fonts/Android.mk
View File

@@ -14,28 +14,6 @@
LOCAL_PATH := $(call my-dir) LOCAL_PATH := $(call my-dir)
##########################################
# create symlink for given font
# $(1): new font $(2): link target
# should be used with eval: $(eval $(call ...))
define create-font-symlink
$(PRODUCT_OUT)/system/fonts/$(1) : $(PRODUCT_OUT)/system/fonts/$(2)
@echo "Symlink: $$@ -> $$<"
@mkdir -p $$(dir $$@)
@rm -rf $$@
$(hide) ln -sf $$(notdir $$<) $$@
# this magic makes LOCAL_REQUIRED_MODULES work
ALL_MODULES.$(1).INSTALLED := \
$(ALL_MODULES.$(1).INSTALLED) $(PRODUCT_OUT)/system/fonts/$(1)
endef
##########################################
# The following fonts are just symlinks, for backward compatibility.
##########################################
$(eval $(call create-font-symlink,DroidSans.ttf,Roboto-Regular.ttf))
$(eval $(call create-font-symlink,DroidSans-Bold.ttf,Roboto-Bold.ttf))
# Run sanity tests on fonts on checkbuild # Run sanity tests on fonts on checkbuild
checkbuild: fontchain_lint checkbuild: fontchain_lint