diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-04-28 15:58:35 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-04-28 15:58:35 +0000 |
commit | 1ee1f0d0714f500650d6c4018618866d066d4741 (patch) | |
tree | 04de8c293b71ee4e8026e7f2bfd235e4aaf76415 | |
parent | 3c5862bdf9a620331d3a950425677cfe02db115e (diff) | |
parent | aafc9fa34aef59162db29c66c813b40e4d8d7c93 (diff) | |
download | noto-fonts-android13-frc-resolv-release.tar.gz |
Snap for 8512216 from aafc9fa34aef59162db29c66c813b40e4d8d7c93 to tm-frc-resolv-releaset_frc_res_330443000android13-frc-resolv-release
Change-Id: If5cc042da23fc421fc45171718ff4def897cb153
-rw-r--r-- | METADATA | 1 | ||||
-rw-r--r-- | OWNERS | 10 | ||||
-rw-r--r-- | emoji-compat/Android.bp | 11 | ||||
-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 | ||||
-rw-r--r-- | other/NotoSansTamilUI-VF.ttf | bin | 79748 -> 82396 bytes |
7 files changed, 15 insertions, 12 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 987216d..afc0bfc 100644 --- a/emoji-compat/Android.bp +++ b/emoji-compat/Android.bp @@ -59,14 +59,9 @@ prebuilt_font { src: "font/NotoColorEmojiFlags.ttf", } -// To use in other build rules. -// Renamed instead of removed to avoid merge conflicts. -// TODO: remove this. -genrule { - name: "Unused_NotoColorEmojiTtf", - srcs: ["font/NotoColorEmojiCompat.ttf"], - out: ["NotoColorEmoji.ttf"], - cmd: "cp $(in) $(out)", +prebuilt_font { + name: "NotoColorEmojiLegacy.ttf", + src: "font/NotoColorEmojiCompatLegacy.ttf", } android_test { 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 \ diff --git a/other/NotoSansTamilUI-VF.ttf b/other/NotoSansTamilUI-VF.ttf Binary files differindex e97c942..12edbd5 100644 --- a/other/NotoSansTamilUI-VF.ttf +++ b/other/NotoSansTamilUI-VF.ttf |