From 5585f04ae6859de9b268b5d1ff21bb817d334056 Mon Sep 17 00:00:00 2001
From: Yo Chiang <yochiang@google.com>
Date: Wed, 20 May 2020 01:28:11 +0800
Subject: [PATCH] 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
---
 data/fonts/Android.bp |  6 ++++--
 data/fonts/Android.mk | 22 ----------------------
 2 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/data/fonts/Android.bp b/data/fonts/Android.bp
index 94e6a80968493..3a3bea43ab86f 100644
--- a/data/fonts/Android.bp
+++ b/data/fonts/Android.bp
@@ -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",
     ],
 }
 
diff --git a/data/fonts/Android.mk b/data/fonts/Android.mk
index e22b723462497..a322b829932b9 100644
--- a/data/fonts/Android.mk
+++ b/data/fonts/Android.mk
@@ -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