diff options
| author | Seigo Nonaka <nona@google.com> | 2022-03-04 10:51:03 -0800 |
|---|---|---|
| committer | Seigo Nonaka <nona@google.com> | 2022-03-09 00:38:21 +0000 |
| commit | 3260aa304c94e6ff2c1977478365d48c92e2cd1b (patch) | |
| tree | fb0983cb624d65550ded307930b490b0ad36f5aa | |
| parent | f0a3c804ba98f9aa5737dc5404ff8bf4c41d8dd8 (diff) | |
| download | noto-fonts-3260aa304c94e6ff2c1977478365d48c92e2cd1b.tar.gz | |
2nd attempt: Add legacy emoji font file for compatibility
This is a 2nd attempt of I19df80035adf7ce2425e9288287c31703e11331b
Bug: 222362958
Test: lunch r11-userdebug && m droid dist
Change-Id: I502c90c0afebb1614d4b1e7e59d7c463aaa0211f
(cherry picked from commit ac83775bbaa8ee27f9156b86a9c17974b30ee556)
| -rw-r--r-- | emoji-compat/Android.bp | 5 | ||||
| -rw-r--r-- | emoji-compat/font/NotoColorEmojiCompatLegacy.ttf | bin | 0 -> 9187560 bytes | |||
| -rw-r--r-- | fonts.mk | 5 |
3 files changed, 10 insertions, 0 deletions
diff --git a/emoji-compat/Android.bp b/emoji-compat/Android.bp index 098e460..afc0bfc 100644 --- a/emoji-compat/Android.bp +++ b/emoji-compat/Android.bp @@ -59,6 +59,11 @@ prebuilt_font { src: "font/NotoColorEmojiFlags.ttf", } +prebuilt_font { + name: "NotoColorEmojiLegacy.ttf", + src: "font/NotoColorEmojiCompatLegacy.ttf", +} + android_test { name: "EmojiCompatTest", diff --git a/emoji-compat/font/NotoColorEmojiCompatLegacy.ttf b/emoji-compat/font/NotoColorEmojiCompatLegacy.ttf Binary files differnew file mode 100644 index 0000000..0565a84 --- /dev/null +++ b/emoji-compat/font/NotoColorEmojiCompatLegacy.ttf @@ -16,7 +16,12 @@ # PRODUCT_COPY_FILES to install the font files, so that the NOTICE file can # get installed too. +ifneq ($(CLOCKWORK_PRODUCT),true) + PRODUCT_PACKAGES := NotoColorEmojiLegacy.ttf +endif + PRODUCT_PACKAGES := \ + $(PRODUCT_PACKAGES) \ NotoColorEmoji.ttf \ NotoColorEmojiFlags.ttf \ NotoNaskhArabic-Bold.ttf \ |