diff options
| author | Yo Chiang <yochiang@google.com> | 2020-06-02 11:15:03 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-02 11:15:03 +0000 |
| commit | 572f829f7ff13121ba50c680074abedd73361677 (patch) | |
| tree | a641aa5c5cec00db4db20d3d6b5dd545cf4c3d8f /data/fonts | |
| parent | f0d034069d1f94875dc9d6020982c2dab6e59cb5 (diff) | |
| parent | f369e4f670f80604f620b20cb192e419b4819602 (diff) | |
Merge "Remove font symlinks hack" am: df792ee3f2 am: f369e4f670
Original change: undetermined
Change-Id: If3a07de26e209dd9f7f4cfa2c3cfed1459b44acc
Diffstat (limited to 'data/fonts')
| -rw-r--r-- | data/fonts/Android.bp | 6 | ||||
| -rw-r--r-- | 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 94e6a8096849..3a3bea43ab86 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 e22b72346249..a322b829932b 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 |