diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2022-03-09 22:52:01 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-03-09 22:52:01 +0000 |
| commit | 3ea5431bc549a1ea67c3b93d65a742de8f66355d (patch) | |
| tree | 2e4385e5dce28701f8760e7f6b1d8f3ac2455cfd | |
| parent | a98f1490a09401c09c3e10402a27d1e33369d150 (diff) | |
| parent | 70e5a3d6cae88e0763b4d7b944e4ca22f58bd0b2 (diff) | |
| download | noto-fonts-3ea5431bc549a1ea67c3b93d65a742de8f66355d.tar.gz | |
Merge "2nd attempt: Add legacy emoji font file for compatibility" into tm-dev am: 70e5a3d6ca
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/noto-fonts/+/17128018
Change-Id: I92f3a9c8dc1f73f075325169caa803cfb538da0e
| -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 \ |