Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5585f04a authored by Yo Chiang's avatar Yo Chiang
Browse files

Remove font symlinks hack 

Remove Android.mk symlink hack.
Use Android.bp prebuilt_font's symlinks property to install symlinks.

Bug: 157537895
Test: m DroidSansMono.ttf
Test: m Roboto-Regular.ttf Roboto-Bold.ttf
Test: # system/fonts/DroidSans.ttf -> Roboto-Regular.ttf
Test: # system/fonts/DroidSans-Bold.ttf -> Roboto-Bold.ttf
Change-Id: I5b311a3e32bd688e2a6be20d9b81d24560b7e133
parent f60c302d

data/fonts/Android.bp

+4 −2
Original line number Diff line number Diff line
@@ -16,8 +16,10 @@ prebuilt_font { 
    name: "DroidSansMono.ttf",

    src: "DroidSansMono.ttf",

    required: [

        "DroidSans.ttf",

        "DroidSans-Bold.ttf",

        // Roboto-Regular.ttf provides DroidSans.ttf as a symlink to itself

        "Roboto-Regular.ttf",

        // Roboto-Bold.ttf provides DroidSans-Bold.ttf as a symlink to itself

        "Roboto-Bold.ttf",

    ],

}

data/fonts/Android.mk

+0 −22
Original line number Diff line number Diff line
@@ -14,28 +14,6 @@ 


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

checkbuild: fontchain_lint