diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-04-06 20:35:27 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-04-06 20:35:27 +0000 |
commit | 2378e6d33df19899650cd7ef0a9df6d0fa3e2ec5 (patch) | |
tree | 04de8c293b71ee4e8026e7f2bfd235e4aaf76415 | |
parent | f0a3c804ba98f9aa5737dc5404ff8bf4c41d8dd8 (diff) | |
parent | 9a2dd9b0f020647b2a426a23b0dca346681289c7 (diff) | |
download | noto-fonts-2378e6d33df19899650cd7ef0a9df6d0fa3e2ec5.tar.gz |
Snap for 8414339 from 9a2dd9b0f020647b2a426a23b0dca346681289c7 to tm-qpr1-release
Change-Id: I1338b6600974310319a2f97647e9bea3112a01e9
-rw-r--r-- | METADATA | 1 | ||||
-rw-r--r-- | OWNERS | 10 | ||||
-rw-r--r-- | emoji-compat/Android.bp | 5 | ||||
-rw-r--r-- | emoji-compat/font/NotoColorEmojiCompat.ttf | bin | 2932728 -> 2961984 bytes | |||
-rw-r--r-- | emoji-compat/font/NotoColorEmojiCompatLegacy.ttf | bin | 0 -> 9187560 bytes | |||
-rw-r--r-- | fonts.mk | 5 |
6 files changed, 17 insertions, 4 deletions
@@ -2,5 +2,6 @@ # CONSULT THE OWNERS AND opensource-licensing@google.com BEFORE # DEPENDING ON IT IN YOUR PROJECT. *** third_party { + license_note: "contains OFL fonts" license_type: BY_EXCEPTION_ONLY } @@ -1,6 +1,8 @@ -# Default code reviewers picked from top 3 or more developers. -# Please update this list if you find better candidates. -dougfelt@google.com -siyamed@google.com +# Android owners nona@google.com +siyamed@google.com +seanmcq@google.com + +# Upstream font owners marekj@google.com +rsheeter@google.com 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/NotoColorEmojiCompat.ttf b/emoji-compat/font/NotoColorEmojiCompat.ttf Binary files differindex 9547537..3fc780f 100644 --- a/emoji-compat/font/NotoColorEmojiCompat.ttf +++ b/emoji-compat/font/NotoColorEmojiCompat.ttf 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 \ |