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

Commit 7718567d authored by Yo Chiang's avatar Yo Chiang Committed by Automerger Merge Worker
Browse files

Merge "Remove font symlinks hack" am: df792ee3 am: f369e4f6 am: 572f829f am: 8f7968d0 

Original change: undetermined

Change-Id: I8a438bbb76f5063f8b3ccf541c2263cc73519d8f
parents 3e4ea13f 8f7968d0

data/fonts/Android.bp

+4 −2
Original line number Original line Diff line number Diff line
@@ -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",

    ],

    ],

}

}

data/fonts/Android.mk

+0 −22
Original line number Original line Diff line number Diff line
@@ -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