From aadf2fd86bf3aa87e0ab7bd2312e3ddc59d83744 Mon Sep 17 00:00:00 2001 From: Patrice Arruda Date: Wed, 15 May 2019 10:21:12 -0700 Subject: Convert Android.mk to Android.bp. See build/soong/README.md for more information. Fixes: b/122332077 Test: Built and checked if the fonts were installed in the correct location in the system image. Change-Id: Ib75d954cfabdc8024fa81bc112baee4bf2c3c3f4 --- Android.mk | 347 ----------------- cjk/Android.bp | 23 ++ emoji/Android.bp | 18 + other-vf/Android.bp | 18 + other/Android.bp | 1078 +++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 1137 insertions(+), 347 deletions(-) delete mode 100644 Android.mk create mode 100644 cjk/Android.bp create mode 100644 emoji/Android.bp create mode 100644 other-vf/Android.bp create mode 100644 other/Android.bp diff --git a/Android.mk b/Android.mk deleted file mode 100644 index bc5aacd..0000000 --- a/Android.mk +++ /dev/null @@ -1,347 +0,0 @@ -# Copyright (C) 2013 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -NOTO_DIR := $(call my-dir) - -include $(call all-makefiles-under,$(NOTO_DIR)) - -# We have to use BUILD_PREBUILT instead of PRODUCT_COPY_FILES, -# to copy over the NOTICE file. -############################################################################# -# $(1): The source file name in LOCAL_PATH. -# It also serves as the module name and the dest file name. -############################################################################# -define build-one-font-module -$(eval include $(CLEAR_VARS))\ -$(eval LOCAL_MODULE := $(1))\ -$(eval LOCAL_SRC_FILES := $(1))\ -$(eval LOCAL_MODULE_CLASS := ETC)\ -$(eval LOCAL_MODULE_TAGS := optional)\ -$(eval LOCAL_MODULE_PATH := $(TARGET_OUT)/fonts)\ -$(eval include $(BUILD_PREBUILT)) -endef - - -############################################################################# -# First "build" the Noto CJK fonts, which have a different directory and -# copyright holder. These are not included in MINIMAL_FONT_FOOTPRINT builds. -############################################################################# -ifneq ($(MINIMAL_FONT_FOOTPRINT),true) -LOCAL_PATH := $(NOTO_DIR)/cjk - -font_src_files := \ - NotoSansCJK-Regular.ttc - -$(foreach f, $(font_src_files), $(call build-one-font-module, $(f))) -font_src_files := - -endif # !MINIMAL_FONT_FOOTPRINT - -############################################################################# -# Similary "build" the Noto CJK fonts for serif family. -# These are not included in SMALLER_FONT_FOOTPRINT builds. -############################################################################# -ifeq ($(filter true,$(EXCLUDE_SERIF_FONTS) $(SMALLER_FONT_FOOTPRINT)),) -LOCAL_PATH := $(NOTO_DIR)/cjk - -font_src_files := \ - NotoSerifCJK-Regular.ttc - -$(foreach f, $(font_src_files), $(call build-one-font-module, $(f))) -font_src_files := - -endif # !EXCLUDE_SERIF_FONTS && !SMALLER_FONT_FOOTPRINT - -############################################################################# -# Now "build" the Noto Color Emoji font, which is in its own directory. It is -# not included in the MINIMAL_FONT_FOOTPRINT builds. -############################################################################# -ifneq ($(MINIMAL_FONT_FOOTPRINT),true) -LOCAL_PATH := $(NOTO_DIR)/emoji - -font_src_files := \ - NotoColorEmoji.ttf - -$(foreach f, $(font_src_files), $(call build-one-font-module, $(f))) -font_src_files := - -endif # !MINIMAL_FONT_FOOTPRINT - -############################################################################# -# Now "build" the rest of the fonts, which live in a separate subdirectory. -############################################################################# -LOCAL_PATH := $(NOTO_DIR)/other - -############################################################################# -# The following fonts are included in all builds. -############################################################################# -font_src_files := \ - NotoSerif-Regular.ttf \ - NotoSerif-Bold.ttf \ - NotoSerif-Italic.ttf \ - NotoSerif-BoldItalic.ttf - -############################################################################# -# The following fonts are excluded from SMALLER_FONT_FOOTPRINT builds. -############################################################################# -ifneq ($(SMALLER_FONT_FOOTPRINT),true) -font_src_files += \ - NotoSansAdlam-Regular.ttf \ - NotoSansAhom-Regular.otf \ - NotoSansAnatolianHieroglyphs-Regular.otf \ - NotoSansAvestan-Regular.ttf \ - NotoSansBalinese-Regular.ttf \ - NotoSansBamum-Regular.ttf \ - NotoSansBassaVah-Regular.otf \ - NotoSansBatak-Regular.ttf \ - NotoSansBengali-Bold.otf \ - NotoSansBengali-Medium.otf \ - NotoSansBengali-Regular.otf \ - NotoSansBengaliUI-Bold.otf \ - NotoSansBengaliUI-Medium.otf \ - NotoSansBengaliUI-Regular.otf \ - NotoSansBhaiksuki-Regular.otf \ - NotoSansBrahmi-Regular.ttf \ - NotoSansBuginese-Regular.ttf \ - NotoSansBuhid-Regular.ttf \ - NotoSansCanadianAboriginal-Regular.ttf \ - NotoSansCarian-Regular.ttf \ - NotoSansChakma-Regular.otf \ - NotoSansCham-Bold.ttf \ - NotoSansCham-Regular.ttf \ - NotoSansCherokee-Regular.ttf \ - NotoSansCoptic-Regular.ttf \ - NotoSansCuneiform-Regular.ttf \ - NotoSansCypriot-Regular.ttf \ - NotoSansDeseret-Regular.ttf \ - NotoSansEgyptianHieroglyphs-Regular.ttf \ - NotoSansElbasan-Regular.otf \ - NotoSansEthiopic-Bold.ttf \ - NotoSansEthiopic-Regular.ttf \ - NotoSansGlagolitic-Regular.ttf \ - NotoSansGothic-Regular.ttf \ - NotoSansGujarati-Bold.ttf \ - NotoSansGujarati-Regular.ttf \ - NotoSansGujaratiUI-Bold.ttf \ - NotoSansGujaratiUI-Regular.ttf \ - NotoSansGurmukhi-Bold.ttf \ - NotoSansGurmukhi-Regular.ttf \ - NotoSansGurmukhiUI-Bold.ttf \ - NotoSansGurmukhiUI-Regular.ttf \ - NotoSansHanunoo-Regular.ttf \ - NotoSansHatran-Regular.otf \ - NotoSansImperialAramaic-Regular.ttf \ - NotoSansInscriptionalPahlavi-Regular.ttf \ - NotoSansInscriptionalParthian-Regular.ttf \ - NotoSansJavanese-Regular.ttf \ - NotoSansKaithi-Regular.ttf \ - NotoSansKannada-Bold.ttf \ - NotoSansKannada-Regular.ttf \ - NotoSansKannadaUI-Bold.ttf \ - NotoSansKannadaUI-Regular.ttf \ - NotoSansKayahLi-Regular.ttf \ - NotoSansKharoshthi-Regular.ttf \ - NotoSansKhmerUI-Bold.ttf \ - NotoSansKhmerUI-Regular.ttf \ - NotoSansLao-Bold.ttf \ - NotoSansLao-Regular.ttf \ - NotoSansLaoUI-Bold.ttf \ - NotoSansLaoUI-Regular.ttf \ - NotoSansLepcha-Regular.ttf \ - NotoSansLimbu-Regular.ttf \ - NotoSansLinearA-Regular.otf \ - NotoSansLinearB-Regular.ttf \ - NotoSansLisu-Regular.ttf \ - NotoSansLycian-Regular.ttf \ - NotoSansLydian-Regular.ttf \ - NotoSansMalayalam-Bold.otf \ - NotoSansMalayalam-Medium.otf \ - NotoSansMalayalam-Regular.otf \ - NotoSansMalayalamUI-Bold.otf \ - NotoSansMalayalamUI-Medium.otf \ - NotoSansMalayalamUI-Regular.otf \ - NotoSansMandaic-Regular.ttf \ - NotoSansManichaean-Regular.otf \ - NotoSansMarchen-Regular.otf \ - NotoSansMeeteiMayek-Regular.ttf \ - NotoSansMeroitic-Regular.otf \ - NotoSansMiao-Regular.otf \ - NotoSansMongolian-Regular.ttf \ - NotoSansMro-Regular.otf \ - NotoSansMultani-Regular.otf \ - NotoSansMyanmar-Bold-ZawDecode.ttf \ - NotoSansMyanmar-Regular-ZawDecode.ttf \ - NotoSansMyanmarUI-Bold-ZawDecode.ttf \ - NotoSansMyanmarUI-Regular-ZawDecode.ttf \ - NotoSansNabataean-Regular.otf \ - NotoSansNewa-Regular.otf \ - NotoSansNewTaiLue-Regular.ttf \ - NotoSansNKo-Regular.ttf \ - NotoSansOgham-Regular.ttf \ - NotoSansOlChiki-Regular.ttf \ - NotoSansOldItalic-Regular.ttf \ - NotoSansOldNorthArabian-Regular.otf \ - NotoSansOldPermic-Regular.otf \ - NotoSansOldPersian-Regular.ttf \ - NotoSansOldSouthArabian-Regular.ttf \ - NotoSansOldTurkic-Regular.ttf \ - NotoSansOriya-Bold.ttf \ - NotoSansOriya-Regular.ttf \ - NotoSansOriyaUI-Bold.ttf \ - NotoSansOriyaUI-Regular.ttf \ - NotoSansOsage-Regular.ttf \ - NotoSansOsmanya-Regular.ttf \ - NotoSansPahawhHmong-Regular.otf \ - NotoSansPalmyrene-Regular.otf \ - NotoSansPauCinHau-Regular.otf \ - NotoSansPhagsPa-Regular.ttf \ - NotoSansPhoenician-Regular.ttf \ - NotoSansRejang-Regular.ttf \ - NotoSansRunic-Regular.ttf \ - NotoSansSamaritan-Regular.ttf \ - NotoSansSaurashtra-Regular.ttf \ - NotoSansSharada-Regular.otf \ - NotoSansShavian-Regular.ttf \ - NotoSansSinhala-Bold.otf \ - NotoSansSinhala-Medium.otf \ - NotoSansSinhala-Regular.otf \ - NotoSansSinhalaUI-Bold.otf \ - NotoSansSinhalaUI-Medium.otf \ - NotoSansSinhalaUI-Regular.otf \ - NotoSansSoraSompeng-Regular.otf \ - NotoSansSundanese-Regular.ttf \ - NotoSansSylotiNagri-Regular.ttf \ - NotoSansSyriacEastern-Regular.ttf \ - NotoSansSyriacEstrangela-Regular.ttf \ - NotoSansSyriacWestern-Regular.ttf \ - NotoSansTagalog-Regular.ttf \ - NotoSansTagbanwa-Regular.ttf \ - NotoSansTaiLe-Regular.ttf \ - NotoSansTaiTham-Regular.ttf \ - NotoSansTaiViet-Regular.ttf \ - NotoSansTamil-Bold.otf \ - NotoSansTamil-Medium.otf \ - NotoSansTamil-Regular.otf \ - NotoSansTamilUI-Bold.otf \ - NotoSansTamilUI-Medium.otf \ - NotoSansTamilUI-Regular.otf \ - NotoSansTelugu-Bold.ttf \ - NotoSansTelugu-Regular.ttf \ - NotoSansTeluguUI-Bold.ttf \ - NotoSansTeluguUI-Regular.ttf \ - NotoSansThaana-Bold.ttf \ - NotoSansThaana-Regular.ttf \ - NotoSansTibetan-Bold.ttf \ - NotoSansTibetan-Regular.ttf \ - NotoSansTifinagh-Regular.ttf \ - NotoSansUgaritic-Regular.ttf \ - NotoSansVai-Regular.ttf \ - NotoSansYi-Regular.ttf -endif # !SMALLER_FONT_FOOTPRINT - -############################################################################# -# The following fonts are excluded from MINIMAL_FONT_FOOTPRINT builds. -############################################################################# -ifneq ($(MINIMAL_FONT_FOOTPRINT),true) -font_src_files += \ - NotoNaskhArabic-Regular.ttf \ - NotoNaskhArabic-Bold.ttf \ - NotoNaskhArabicUI-Regular.ttf \ - NotoNaskhArabicUI-Bold.ttf \ - NotoSansArmenian-Regular.otf \ - NotoSansArmenian-Bold.otf \ - NotoSansArmenian-Medium.otf \ - NotoSansDevanagari-Regular.otf \ - NotoSansDevanagari-Bold.otf \ - NotoSansDevanagari-Medium.otf \ - NotoSansDevanagariUI-Regular.otf \ - NotoSansDevanagariUI-Bold.otf \ - NotoSansDevanagariUI-Medium.otf \ - NotoSansGeorgian-Regular.otf \ - NotoSansGeorgian-Bold.otf \ - NotoSansGeorgian-Medium.otf \ - NotoSansHebrew-Regular.ttf \ - NotoSansHebrew-Bold.ttf \ - NotoSansSymbols-Regular-Subsetted.ttf \ - NotoSansSymbols-Regular-Subsetted2.ttf \ - NotoSansThai-Regular.ttf \ - NotoSansThai-Bold.ttf \ - NotoSansThaiUI-Regular.ttf \ - NotoSansThaiUI-Bold.ttf -endif # !MINIMAL_FONT_FOOTPRINT - -ifeq ($(filter true,$(EXCLUDE_SERIF_FONTS) $(SMALLER_FONT_FOOTPRINT)),) -font_src_files += \ - NotoSerifArmenian-Bold.otf \ - NotoSerifArmenian-Regular.otf \ - NotoSerifBengali-Bold.ttf \ - NotoSerifBengali-Regular.ttf \ - NotoSerifDevanagari-Bold.ttf \ - NotoSerifDevanagari-Regular.ttf \ - NotoSerifEthiopic-Bold.otf \ - NotoSerifEthiopic-Regular.otf \ - NotoSerifGeorgian-Bold.otf \ - NotoSerifGeorgian-Regular.otf \ - NotoSerifGujarati-Bold.ttf \ - NotoSerifGujarati-Regular.ttf \ - NotoSerifGurmukhi-Bold.otf \ - NotoSerifGurmukhi-Regular.otf \ - NotoSerifHebrew-Bold.ttf \ - NotoSerifHebrew-Regular.ttf \ - NotoSerifKannada-Bold.ttf \ - NotoSerifKannada-Regular.ttf \ - NotoSerifKhmer-Bold.otf \ - NotoSerifKhmer-Regular.otf \ - NotoSerifLao-Bold.ttf \ - NotoSerifLao-Regular.ttf \ - NotoSerifMalayalam-Bold.ttf \ - NotoSerifMalayalam-Regular.ttf \ - NotoSerifMyanmar-Bold.otf \ - NotoSerifMyanmar-Regular.otf \ - NotoSerifSinhala-Bold.otf \ - NotoSerifSinhala-Regular.otf \ - NotoSerifTamil-Bold.otf \ - NotoSerifTamil-Regular.otf \ - NotoSerifTelugu-Bold.ttf \ - NotoSerifTelugu-Regular.ttf \ - NotoSerifThai-Bold.ttf \ - NotoSerifThai-Regular.ttf -endif # !EXCLUDE_SERIF_FONTS && !SMALLER_FONT_FOOTPRINT - -$(foreach f, $(font_src_files), $(call build-one-font-module, $(f))) - -############################################################################# -# Now "build" the variable fonts, which live in a separate subdirectory. -# The only variable fonts are for Khmer Sans, which is excluded in -# SMALLER_FONT_FOOTPRINT build. -############################################################################# - -ifneq ($(SMALLER_FONT_FOOTPRINT),true) - -LOCAL_PATH := $(NOTO_DIR)/other-vf - -font_src_files := \ - NotoSansKhmer-VF.ttf - -$(foreach f, $(font_src_files), $(call build-one-font-module, $(f))) - -endif # !SMALLER_FONT_FOOTPRINT - -NOTO_DIR := -build-one-font-module := -font_src_files := - - - - diff --git a/cjk/Android.bp b/cjk/Android.bp new file mode 100644 index 0000000..5ff7204 --- /dev/null +++ b/cjk/Android.bp @@ -0,0 +1,23 @@ +// Copyright (C) 2019 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +prebuilt_font { + name: "NotoSansCJK-Regular.ttc", + src: "NotoSansCJK-Regular.ttc", +} + +prebuilt_font { + name: "NotoSerifCJK-Regular.ttc", + src: "NotoSerifCJK-Regular.ttc", +} diff --git a/emoji/Android.bp b/emoji/Android.bp new file mode 100644 index 0000000..7565e43 --- /dev/null +++ b/emoji/Android.bp @@ -0,0 +1,18 @@ +// Copyright (C) 2019 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +prebuilt_font { + name: "NotoColorEmoji.ttf", + src: "NotoColorEmoji.ttf", +} diff --git a/other-vf/Android.bp b/other-vf/Android.bp new file mode 100644 index 0000000..4e88ad4 --- /dev/null +++ b/other-vf/Android.bp @@ -0,0 +1,18 @@ +// Copyright (C) 2019 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +prebuilt_font { + name: "NotoSansKhmer-VF.ttf", + src: "NotoSansKhmer-VF.ttf", +} diff --git a/other/Android.bp b/other/Android.bp new file mode 100644 index 0000000..3a790e3 --- /dev/null +++ b/other/Android.bp @@ -0,0 +1,1078 @@ +// Copyright (C) 2019 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +prebuilt_font { + name: "NotoSerif-Regular.ttf", + src: "NotoSerif-Regular.ttf", +} + +prebuilt_font { + name: "NotoSerif-Bold.ttf", + src: "NotoSerif-Bold.ttf", +} + +prebuilt_font { + name: "NotoSerif-Italic.ttf", + src: "NotoSerif-Italic.ttf", +} + +prebuilt_font { + name: "NotoSerif-BoldItalic.ttf", + src: "NotoSerif-BoldItalic.ttf", +} + +prebuilt_font { + name: "NotoSansAdlam-Regular.ttf", + src: "NotoSansAdlam-Regular.ttf", +} + +prebuilt_font { + name: "NotoSansAhom-Regular.otf", + src: "NotoSansAhom-Regular.otf", +} + +prebuilt_font { + name: "NotoSansAnatolianHieroglyphs-Regular.otf", + src: "NotoSansAnatolianHieroglyphs-Regular.otf", +} + +prebuilt_font { + name: "NotoSansAvestan-Regular.ttf", + src: "NotoSansAvestan-Regular.ttf", +} + +prebuilt_font { + name: "NotoSansBalinese-Regular.ttf", + src: "NotoSansBalinese-Regular.ttf", +} + +prebuilt_font { + name: "NotoSansBamum-Regular.ttf", + src: "NotoSansBamum-Regular.ttf", +} + +prebuilt_font { + name: "NotoSansBassaVah-Regular.otf", + src: "NotoSansBassaVah-Regular.otf", +} + +prebuilt_font { + name: "NotoSansBatak-Regular.ttf", + src: "NotoSansBatak-Regular.ttf", +} + +prebuilt_font { + name: "NotoSansBengali-Bold.otf", + src: "NotoSansBengali-Bold.otf", +} + +prebuilt_font { + name: "NotoSansBengali-Medium.otf", + src: "NotoSansBengali-Medium.otf", +} + +prebuilt_font { + name: "NotoSansBengali-Regular.otf", + src: "NotoSansBengali-Regular.otf", +} + +prebuilt_font { + name: "NotoSansBengaliUI-Bold.otf", + src: "NotoSansBengaliUI-Bold.otf", +} + +prebuilt_font { + name: "NotoSansBengaliUI-Medium.otf", + src: "NotoSansBengaliUI-Medium.otf", +} + +prebuilt_font { + name: "NotoSansBengaliUI-Regular.otf", + src: "NotoSansBengaliUI-Regular.otf", +} + +prebuilt_font { + name: "NotoSansBhaiksuki-Regular.otf", + src: "NotoSansBhaiksuki-Regular.otf", +} + +prebuilt_font { + name: "NotoSansBrahmi-Regular.ttf", + src: "NotoSansBrahmi-Regular.ttf", +} + +prebuilt_font { + name: "NotoSansBuginese-Regular.ttf", + src: "NotoSansBuginese-Regular.ttf", +} + +prebuilt_font { + name: "NotoSansBuhid-Regular.ttf", + src: "NotoSansBuhid-Regular.ttf", +} + +prebuilt_font { + name: "NotoSansCanadianAboriginal-Regular.ttf", + src: "NotoSansCanadianAboriginal-Regular.ttf", +} + +prebuilt_font { + name: "NotoSansCarian-Regular.ttf", + src: "NotoSansCarian-Regular.ttf", +} + +prebuilt_font { + name: "NotoSansChakma-Regular.otf", + src: "NotoSansChakma-Regular.otf", +} + +prebuilt_font { + name: "NotoSansCham-Bold.ttf", + src: "NotoSansCham-Bold.ttf", +} + +prebuilt_font { + name: "NotoSansCham-Regular.ttf", + src: "NotoSansCham-Regular.ttf", +} + +prebuilt_font { + name: "NotoSansCherokee-Regular.ttf", + src: "NotoSansCherokee-Regular.ttf", +} + +prebuilt_font { + name: "NotoSansCoptic-Regular.ttf", + src: "NotoSansCoptic-Regular.ttf", +} + +prebuilt_font { + name: "NotoSansCuneiform-Regular.ttf", + src: "NotoSansCuneiform-Regular.ttf", +} + +prebuilt_font { + name: "NotoSansCypriot-Regular.ttf", + src: "NotoSansCypriot-Regular.ttf", +} + +prebuilt_font { + name: "NotoSansDeseret-Regular.ttf", + src: "NotoSansDeseret-Regular.ttf", +} + +prebuilt_font { + name: "NotoSansEgyptianHieroglyphs-Regular.ttf", + src: "NotoSansEgyptianHieroglyphs-Regular.ttf", +} + +prebuilt_font { + name: "NotoSansElbasan-Regular.otf", + src: "NotoSansElbasan-Regular.otf", +} + +prebuilt_font { + name: "NotoSansEthiopic-Bold.ttf", + src: "NotoSansEthiopic-Bold.ttf", +} + +prebuilt_font { + name: "NotoSansEthiopic-Regular.ttf", + src: "NotoSansEthiopic-Regular.ttf", +} + +prebuilt_font { + name: "NotoSansGlagolitic-Regular.ttf", + src: "NotoSansGlagolitic-Regular.ttf", +} + +prebuilt_font { + name: "NotoSansGothic-Regular.ttf", + src: "NotoSansGothic-Regular.ttf", +} + +prebuilt_font { + name: "NotoSansGujarati-Bold.ttf", + src: "NotoSansGujarati-Bold.ttf", +} + +prebuilt_font { + name: "NotoSansGujarati-Regular.ttf", + src: "NotoSansGujarati-Regular.ttf", +} + +prebuilt_font { + name: "NotoSansGujaratiUI-Bold.ttf", + src: "NotoSansGujaratiUI-Bold.ttf", +} + +prebuilt_font { + name: "NotoSansGujaratiUI-Regular.ttf", + src: "NotoSansGujaratiUI-Regular.ttf", +} + +prebuilt_font { + name: "NotoSansGurmukhi-Bold.ttf", + src: "NotoSansGurmukhi-Bold.ttf", +} + +prebuilt_font { + name: "NotoSansGurmukhi-Regular.ttf", + src: "NotoSansGurmukhi-Regular.ttf", +} + +prebuilt_font { + name: "NotoSansGurmukhiUI-Bold.ttf", + src: "NotoSansGurmukhiUI-Bold.ttf", +} + +prebuilt_font { + name: "NotoSansGurmukhiUI-Regular.ttf", + src: "NotoSansGurmukhiUI-Regular.ttf", +} + +prebuilt_font { + name: "NotoSansHanunoo-Regular.ttf", + src: "NotoSansHanunoo-Regular.ttf", +} + +prebuilt_font { + name: "NotoSansHatran-Regular.otf", + src: "NotoSansHatran-Regular.otf", +} + +prebuilt_font { + name: "NotoSansImperialAramaic-Regular.ttf", + src: "NotoSansImperialAramaic-Regular.ttf", +} + +prebuilt_font { + name: "NotoSansInscriptionalPahlavi-Regular.ttf", + src: "NotoSansInscriptionalPahlavi-Regular.ttf", +} + +prebuilt_font { + name: "NotoSansInscriptionalParthian-Regular.ttf", + src: "NotoSansInscriptionalParthian-Regular.ttf", +} + +prebuilt_font { + name: "NotoSansJavanese-Regular.ttf", + src: "NotoSansJavanese-Regular.ttf", +} + +prebuilt_font { + name: "NotoSansKaithi-Regular.ttf", + src: "NotoSansKaithi-Regular.ttf", +} + +prebuilt_font { + name: "NotoSansKannada-Bold.ttf", + src: "NotoSansKannada-Bold.ttf", +} + +prebuilt_font { + name: "NotoSansKannada-Regular.ttf", + src: "NotoSansKannada-Regular.ttf", +} + +prebuilt_font { + name: "NotoSansKannadaUI-Bold.ttf", + src: "NotoSansKannadaUI-Bold.ttf", +} + +prebuilt_font { + name: "NotoSansKannadaUI-Regular.ttf", + src: "NotoSansKannadaUI-Regular.ttf", +} + +prebuilt_font { + name: "NotoSansKayahLi-Regular.ttf", + src: "NotoSansKayahLi-Regular.ttf", +} + +prebuilt_font { + name: "NotoSansKharoshthi-Regular.ttf", + src: "NotoSansKharoshthi-Regular.ttf", +} + +prebuilt_font { + name: "NotoSansKhmerUI-Bold.ttf", + src: "NotoSansKhmerUI-Bold.ttf", +} + +prebuilt_font { + name: "NotoSansKhmerUI-Regular.ttf", + src: "NotoSansKhmerUI-Regular.ttf", +} + +prebuilt_font { + name: "NotoSansLao-Bold.ttf", + src: "NotoSansLao-Bold.ttf", +} + +prebuilt_font { + name: "NotoSansLao-Regular.ttf", + src: "NotoSansLao-Regular.ttf", +} + +prebuilt_font { + name: "NotoSansLaoUI-Bold.ttf", + src: "NotoSansLaoUI-Bold.ttf", +} + +prebuilt_font { + name: "NotoSansLaoUI-Regular.ttf", + src: "NotoSansLaoUI-Regular.ttf", +} + +prebuilt_font { + name: "NotoSansLepcha-Regular.ttf", + src: "NotoSansLepcha-Regular.ttf", +} + +prebuilt_font { + name: "NotoSansLimbu-Regular.ttf", + src: "NotoSansLimbu-Regular.ttf", +} + +prebuilt_font { + name: "NotoSansLinearA-Regular.otf", + src: "NotoSansLinearA-Regular.otf", +} + +prebuilt_font { + name: "NotoSansLinearB-Regular.ttf", + src: "NotoSansLinearB-Regular.ttf", +} + +prebuilt_font { + name: "NotoSansLisu-Regular.ttf", + src: "NotoSansLisu-Regular.ttf", +} + +prebuilt_font { + name: "NotoSansLycian-Regular.ttf", + src: "NotoSansLycian-Regular.ttf", +} + +prebuilt_font { + name: "NotoSansLydian-Regular.ttf", + src: "NotoSansLydian-Regular.ttf", +} + +prebuilt_font { + name: "NotoSansMalayalam-Bold.otf", + src: "NotoSansMalayalam-Bold.otf", +} + +prebuilt_font { + name: "NotoSansMalayalam-Medium.otf", + src: "NotoSansMalayalam-Medium.otf", +} + +prebuilt_font { + name: "NotoSansMalayalam-Regular.otf", + src: "NotoSansMalayalam-Regular.otf", +} + +prebuilt_font { + name: "NotoSansMalayalamUI-Bold.otf", + src: "NotoSansMalayalamUI-Bold.otf", +} + +prebuilt_font { + name: "NotoSansMalayalamUI-Medium.otf", + src: "NotoSansMalayalamUI-Medium.otf", +} + +prebuilt_font { + name: "NotoSansMalayalamUI-Regular.otf", + src: "NotoSansMalayalamUI-Regular.otf", +} + +prebuilt_font { + name: "NotoSansMandaic-Regular.ttf", + src: "NotoSansMandaic-Regular.ttf", +} + +prebuilt_font { + name: "NotoSansManichaean-Regular.otf", + src: "NotoSansManichaean-Regular.otf", +} + +prebuilt_font { + name: "NotoSansMarchen-Regular.otf", + src: "NotoSansMarchen-Regular.otf", +} + +prebuilt_font { + name: "NotoSansMeeteiMayek-Regular.ttf", + src: "NotoSansMeeteiMayek-Regular.ttf", +} + +prebuilt_font { + name: "NotoSansMeroitic-Regular.otf", + src: "NotoSansMeroitic-Regular.otf", +} + +prebuilt_font { + name: "NotoSansMiao-Regular.otf", + src: "NotoSansMiao-Regular.otf", +} + +prebuilt_font { + name: "NotoSansMongolian-Regular.ttf", + src: "NotoSansMongolian-Regular.ttf", +} + +prebuilt_font { + name: "NotoSansMro-Regular.otf", + src: "NotoSansMro-Regular.otf", +} + +prebuilt_font { + name: "NotoSansMultani-Regular.otf", + src: "NotoSansMultani-Regular.otf", +} + +prebuilt_font { + name: "NotoSansMyanmar-Bold-ZawDecode.ttf", + src: "NotoSansMyanmar-Bold-ZawDecode.ttf", +} + +prebuilt_font { + name: "NotoSansMyanmar-Regular-ZawDecode.ttf", + src: "NotoSansMyanmar-Regular-ZawDecode.ttf", +} + +prebuilt_font { + name: "NotoSansMyanmarUI-Bold-ZawDecode.ttf", + src: "NotoSansMyanmarUI-Bold-ZawDecode.ttf", +} + +prebuilt_font { + name: "NotoSansMyanmarUI-Regular-ZawDecode.ttf", + src: "NotoSansMyanmarUI-Regular-ZawDecode.ttf", +} + +prebuilt_font { + name: "NotoSansNabataean-Regular.otf", + src: "NotoSansNabataean-Regular.otf", +} + +prebuilt_font { + name: "NotoSansNewa-Regular.otf", + src: "NotoSansNewa-Regular.otf", +} + +prebuilt_font { + name: "NotoSansNewTaiLue-Regular.ttf", + src: "NotoSansNewTaiLue-Regular.ttf", +} + +prebuilt_font { + name: "NotoSansNKo-Regular.ttf", + src: "NotoSansNKo-Regular.ttf", +} + +prebuilt_font { + name: "NotoSansOgham-Regular.ttf", + src: "NotoSansOgham-Regular.ttf", +} + +prebuilt_font { + name: "NotoSansOlChiki-Regular.ttf", + src: "NotoSansOlChiki-Regular.ttf", +} + +prebuilt_font { + name: "NotoSansOldItalic-Regular.ttf", + src: "NotoSansOldItalic-Regular.ttf", +} + +prebuilt_font { + name: "NotoSansOldNorthArabian-Regular.otf", + src: "NotoSansOldNorthArabian-Regular.otf", +} + +prebuilt_font { + name: "NotoSansOldPermic-Regular.otf", + src: "NotoSansOldPermic-Regular.otf", +} + +prebuilt_font { + name: "NotoSansOldPersian-Regular.ttf", + src: "NotoSansOldPersian-Regular.ttf", +} + +prebuilt_font { + name: "NotoSansOldSouthArabian-Regular.ttf", + src: "NotoSansOldSouthArabian-Regular.ttf", +} + +prebuilt_font { + name: "NotoSansOldTurkic-Regular.ttf", + src: "NotoSansOldTurkic-Regular.ttf", +} + +prebuilt_font { + name: "NotoSansOriya-Bold.ttf", + src: "NotoSansOriya-Bold.ttf", +} + +prebuilt_font { + name: "NotoSansOriya-Regular.ttf", + src: "NotoSansOriya-Regular.ttf", +} + +prebuilt_font { + name: "NotoSansOriyaUI-Bold.ttf", + src: "NotoSansOriyaUI-Bold.ttf", +} + +prebuilt_font { + name: "NotoSansOriyaUI-Regular.ttf", + src: "NotoSansOriyaUI-Regular.ttf", +} + +prebuilt_font { + name: "NotoSansOsage-Regular.ttf", + src: "NotoSansOsage-Regular.ttf", +} + +prebuilt_font { + name: "NotoSansOsmanya-Regular.ttf", + src: "NotoSansOsmanya-Regular.ttf", +} + +prebuilt_font { + name: "NotoSansPahawhHmong-Regular.otf", + src: "NotoSansPahawhHmong-Regular.otf", +} + +prebuilt_font { + name: "NotoSansPalmyrene-Regular.otf", + src: "NotoSansPalmyrene-Regular.otf", +} + +prebuilt_font { + name: "NotoSansPauCinHau-Regular.otf", + src: "NotoSansPauCinHau-Regular.otf", +} + +prebuilt_font { + name: "NotoSansPhagsPa-Regular.ttf", + src: "NotoSansPhagsPa-Regular.ttf", +} + +prebuilt_font { + name: "NotoSansPhoenician-Regular.ttf", + src: "NotoSansPhoenician-Regular.ttf", +} + +prebuilt_font { + name: "NotoSansRejang-Regular.ttf", + src: "NotoSansRejang-Regular.ttf", +} + +prebuilt_font { + name: "NotoSansRunic-Regular.ttf", + src: "NotoSansRunic-Regular.ttf", +} + +prebuilt_font { + name: "NotoSansSamaritan-Regular.ttf", + src: "NotoSansSamaritan-Regular.ttf", +} + +prebuilt_font { + name: "NotoSansSaurashtra-Regular.ttf", + src: "NotoSansSaurashtra-Regular.ttf", +} + +prebuilt_font { + name: "NotoSansSharada-Regular.otf", + src: "NotoSansSharada-Regular.otf", +} + +prebuilt_font { + name: "NotoSansShavian-Regular.ttf", + src: "NotoSansShavian-Regular.ttf", +} + +prebuilt_font { + name: "NotoSansSinhala-Bold.otf", + src: "NotoSansSinhala-Bold.otf", +} + +prebuilt_font { + name: "NotoSansSinhala-Regular.otf", + src: "NotoSansSinhala-Regular.otf", +} + +prebuilt_font { + name: "NotoSansSinhala-Medium.otf", + src: "NotoSansSinhala-Medium.otf", +} + +prebuilt_font { + name: "NotoSansSinhalaUI-Bold.otf", + src: "NotoSansSinhalaUI-Bold.otf", +} + +prebuilt_font { + name: "NotoSansSinhalaUI-Medium.otf", + src: "NotoSansSinhalaUI-Medium.otf", +} + +prebuilt_font { + name: "NotoSansSinhalaUI-Regular.otf", + src: "NotoSansSinhalaUI-Regular.otf", +} + +prebuilt_font { + name: "NotoSansSoraSompeng-Regular.otf", + src: "NotoSansSoraSompeng-Regular.otf", +} + +prebuilt_font { + name: "NotoSansSundanese-Regular.ttf", + src: "NotoSansSundanese-Regular.ttf", +} + +prebuilt_font { + name: "NotoSansSylotiNagri-Regular.ttf", + src: "NotoSansSylotiNagri-Regular.ttf", +} + +prebuilt_font { + name: "NotoSansSyriacEastern-Regular.ttf", + src: "NotoSansSyriacEastern-Regular.ttf", +} + +prebuilt_font { + name: "NotoSansSyriacEstrangela-Regular.ttf", + src: "NotoSansSyriacEstrangela-Regular.ttf", +} + +prebuilt_font { + name: "NotoSansSyriacWestern-Regular.ttf", + src: "NotoSansSyriacWestern-Regular.ttf", +} + +prebuilt_font { + name: "NotoSansTagalog-Regular.ttf", + src: "NotoSansTagalog-Regular.ttf", +} + +prebuilt_font { + name: "NotoSansTagbanwa-Regular.ttf", + src: "NotoSansTagbanwa-Regular.ttf", +} + +prebuilt_font { + name: "NotoSansTaiLe-Regular.ttf", + src: "NotoSansTaiLe-Regular.ttf", +} + +prebuilt_font { + name: "NotoSansTaiTham-Regular.ttf", + src: "NotoSansTaiTham-Regular.ttf", +} + +prebuilt_font { + name: "NotoSansTaiViet-Regular.ttf", + src: "NotoSansTaiViet-Regular.ttf", +} + +prebuilt_font { + name: "NotoSansTamil-Bold.otf", + src: "NotoSansTamil-Bold.otf", +} + +prebuilt_font { + name: "NotoSansTamil-Medium.otf", + src: "NotoSansTamil-Medium.otf", +} + +prebuilt_font { + name: "NotoSansTamil-Regular.otf", + src: "NotoSansTamil-Regular.otf", +} + +prebuilt_font { + name: "NotoSansTamilUI-Bold.otf", + src: "NotoSansTamilUI-Bold.otf", +} + +prebuilt_font { + name: "NotoSansTamilUI-Medium.otf", + src: "NotoSansTamilUI-Medium.otf", +} + +prebuilt_font { + name: "NotoSansTamilUI-Regular.otf", + src: "NotoSansTamilUI-Regular.otf", +} + +prebuilt_font { + name: "NotoSansTelugu-Bold.ttf", + src: "NotoSansTelugu-Bold.ttf", +} + +prebuilt_font { + name: "NotoSansTelugu-Regular.ttf", + src: "NotoSansTelugu-Regular.ttf", +} + +prebuilt_font { + name: "NotoSansTeluguUI-Bold.ttf", + src: "NotoSansTeluguUI-Bold.ttf", +} + +prebuilt_font { + name: "NotoSansTeluguUI-Regular.ttf", + src: "NotoSansTeluguUI-Regular.ttf", +} + +prebuilt_font { + name: "NotoSansThaana-Bold.ttf", + src: "NotoSansThaana-Bold.ttf", +} + +prebuilt_font { + name: "NotoSansThaana-Regular.ttf", + src: "NotoSansThaana-Regular.ttf", +} + +prebuilt_font { + name: "NotoSansTibetan-Bold.ttf", + src: "NotoSansTibetan-Bold.ttf", +} + +prebuilt_font { + name: "NotoSansTibetan-Regular.ttf", + src: "NotoSansTibetan-Regular.ttf", +} + +prebuilt_font { + name: "NotoSansTifinagh-Regular.ttf", + src: "NotoSansTifinagh-Regular.ttf", +} + +prebuilt_font { + name: "NotoSansUgaritic-Regular.ttf", + src: "NotoSansUgaritic-Regular.ttf", +} + +prebuilt_font { + name: "NotoSansVai-Regular.ttf", + src: "NotoSansVai-Regular.ttf", +} + +prebuilt_font { + name: "NotoSansYi-Regular.ttf", + src: "NotoSansYi-Regular.ttf", +} + +prebuilt_font { + name: "NotoNaskhArabic-Regular.ttf", + src: "NotoNaskhArabic-Regular.ttf", +} + +prebuilt_font { + name: "NotoNaskhArabic-Bold.ttf", + src: "NotoNaskhArabic-Bold.ttf", +} + +prebuilt_font { + name: "NotoNaskhArabicUI-Regular.ttf", + src: "NotoNaskhArabicUI-Regular.ttf", +} + +prebuilt_font { + name: "NotoNaskhArabicUI-Bold.ttf", + src: "NotoNaskhArabicUI-Bold.ttf", +} + +prebuilt_font { + name: "NotoSansArmenian-Regular.otf", + src: "NotoSansArmenian-Regular.otf", +} + +prebuilt_font { + name: "NotoSansArmenian-Bold.otf", + src: "NotoSansArmenian-Bold.otf", +} + +prebuilt_font { + name: "NotoSansArmenian-Medium.otf", + src: "NotoSansArmenian-Medium.otf", +} + +prebuilt_font { + name: "NotoSansDevanagari-Regular.otf", + src: "NotoSansDevanagari-Regular.otf", +} + +prebuilt_font { + name: "NotoSansDevanagari-Bold.otf", + src: "NotoSansDevanagari-Bold.otf", +} + +prebuilt_font { + name: "NotoSansDevanagari-Medium.otf", + src: "NotoSansDevanagari-Medium.otf", +} + +prebuilt_font { + name: "NotoSansDevanagariUI-Regular.otf", + src: "NotoSansDevanagariUI-Regular.otf", +} + +prebuilt_font { + name: "NotoSansDevanagariUI-Bold.otf", + src: "NotoSansDevanagariUI-Bold.otf", +} + +prebuilt_font { + name: "NotoSansDevanagariUI-Medium.otf", + src: "NotoSansDevanagariUI-Medium.otf", +} + +prebuilt_font { + name: "NotoSansGeorgian-Regular.otf", + src: "NotoSansGeorgian-Regular.otf", +} + +prebuilt_font { + name: "NotoSansGeorgian-Bold.otf", + src: "NotoSansGeorgian-Bold.otf", +} + +prebuilt_font { + name: "NotoSansGeorgian-Medium.otf", + src: "NotoSansGeorgian-Medium.otf", +} + +prebuilt_font { + name: "NotoSansHebrew-Regular.ttf", + src: "NotoSansHebrew-Regular.ttf", +} + +prebuilt_font { + name: "NotoSansHebrew-Bold.ttf", + src: "NotoSansHebrew-Bold.ttf", +} + +prebuilt_font { + name: "NotoSansSymbols-Regular-Subsetted.ttf", + src: "NotoSansSymbols-Regular-Subsetted.ttf", +} + +prebuilt_font { + name: "NotoSansSymbols-Regular-Subsetted2.ttf", + src: "NotoSansSymbols-Regular-Subsetted2.ttf", +} + +prebuilt_font { + name: "NotoSansThai-Regular.ttf", + src: "NotoSansThai-Regular.ttf", +} + +prebuilt_font { + name: "NotoSansThai-Bold.ttf", + src: "NotoSansThai-Bold.ttf", +} + +prebuilt_font { + name: "NotoSansThaiUI-Regular.ttf", + src: "NotoSansThaiUI-Regular.ttf", +} + +prebuilt_font { + name: "NotoSansThaiUI-Bold.ttf", + src: "NotoSansThaiUI-Bold.ttf", +} + +prebuilt_font { + name: "NotoSerifArmenian-Bold.otf", + src: "NotoSerifArmenian-Bold.otf", +} + +prebuilt_font { + name: "NotoSerifArmenian-Regular.otf", + src: "NotoSerifArmenian-Regular.otf", +} + +prebuilt_font { + name: "NotoSerifBengali-Bold.ttf", + src: "NotoSerifBengali-Bold.ttf", +} + +prebuilt_font { + name: "NotoSerifBengali-Regular.ttf", + src: "NotoSerifBengali-Regular.ttf", +} + +prebuilt_font { + name: "NotoSerifDevanagari-Bold.ttf", + src: "NotoSerifDevanagari-Bold.ttf", +} + +prebuilt_font { + name: "NotoSerifDevanagari-Regular.ttf", + src: "NotoSerifDevanagari-Regular.ttf", +} + +prebuilt_font { + name: "NotoSerifEthiopic-Bold.otf", + src: "NotoSerifEthiopic-Bold.otf", +} + +prebuilt_font { + name: "NotoSerifEthiopic-Regular.otf", + src: "NotoSerifEthiopic-Regular.otf", +} + +prebuilt_font { + name: "NotoSerifGeorgian-Bold.otf", + src: "NotoSerifGeorgian-Bold.otf", +} + +prebuilt_font { + name: "NotoSerifGeorgian-Regular.otf", + src: "NotoSerifGeorgian-Regular.otf", +} + +prebuilt_font { + name: "NotoSerifGujarati-Bold.ttf", + src: "NotoSerifGujarati-Bold.ttf", +} + +prebuilt_font { + name: "NotoSerifGujarati-Regular.ttf", + src: "NotoSerifGujarati-Regular.ttf", +} + +prebuilt_font { + name: "NotoSerifGurmukhi-Bold.otf", + src: "NotoSerifGurmukhi-Bold.otf", +} + +prebuilt_font { + name: "NotoSerifGurmukhi-Regular.otf", + src: "NotoSerifGurmukhi-Regular.otf", +} + +prebuilt_font { + name: "NotoSerifHebrew-Bold.ttf", + src: "NotoSerifHebrew-Bold.ttf", +} + +prebuilt_font { + name: "NotoSerifHebrew-Regular.ttf", + src: "NotoSerifHebrew-Regular.ttf", +} + +prebuilt_font { + name: "NotoSerifKannada-Bold.ttf", + src: "NotoSerifKannada-Bold.ttf", +} + +prebuilt_font { + name: "NotoSerifKannada-Regular.ttf", + src: "NotoSerifKannada-Regular.ttf", +} + +prebuilt_font { + name: "NotoSerifKhmer-Bold.otf", + src: "NotoSerifKhmer-Bold.otf", +} + +prebuilt_font { + name: "NotoSerifKhmer-Regular.otf", + src: "NotoSerifKhmer-Regular.otf", +} + +prebuilt_font { + name: "NotoSerifLao-Bold.ttf", + src: "NotoSerifLao-Bold.ttf", +} + +prebuilt_font { + name: "NotoSerifLao-Regular.ttf", + src: "NotoSerifLao-Regular.ttf", +} + +prebuilt_font { + name: "NotoSerifMalayalam-Bold.ttf", + src: "NotoSerifMalayalam-Bold.ttf", +} + +prebuilt_font { + name: "NotoSerifMalayalam-Regular.ttf", + src: "NotoSerifMalayalam-Regular.ttf", +} + +prebuilt_font { + name: "NotoSerifMyanmar-Bold.otf", + src: "NotoSerifMyanmar-Bold.otf", +} + +prebuilt_font { + name: "NotoSerifMyanmar-Regular.otf", + src: "NotoSerifMyanmar-Regular.otf", +} + +prebuilt_font { + name: "NotoSerifSinhala-Bold.otf", + src: "NotoSerifSinhala-Bold.otf", +} + +prebuilt_font { + name: "NotoSerifSinhala-Regular.otf", + src: "NotoSerifSinhala-Regular.otf", +} + +prebuilt_font { + name: "NotoSerifTamil-Bold.otf", + src: "NotoSerifTamil-Bold.otf", +} + +prebuilt_font { + name: "NotoSerifTamil-Regular.otf", + src: "NotoSerifTamil-Regular.otf", +} + +prebuilt_font { + name: "NotoSerifTelugu-Bold.ttf", + src: "NotoSerifTelugu-Bold.ttf", +} + +prebuilt_font { + name: "NotoSerifTelugu-Regular.ttf", + src: "NotoSerifTelugu-Regular.ttf", +} + +prebuilt_font { + name: "NotoSerifThai-Bold.ttf", + src: "NotoSerifThai-Bold.ttf", +} + +prebuilt_font { + name: "NotoSerifThai-Regular.ttf", + src: "NotoSerifThai-Regular.ttf", +} -- cgit v1.2.3 From 7278ee75f0413c2fb1d9e89f9583131b22af8bdc Mon Sep 17 00:00:00 2001 From: Qingqing Deng Date: Tue, 8 Oct 2019 13:59:05 -0700 Subject: Update font to unicode 12.1. Bug: 141714198 Test: m fontchain_lint Change-Id: I00af2eca45acd60e2c26f29e4b6110b65b36f501 --- emoji/NotoColorEmoji.ttf | Bin 9384876 -> 10084028 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/emoji/NotoColorEmoji.ttf b/emoji/NotoColorEmoji.ttf index 3c2688f..44e020d 100644 Binary files a/emoji/NotoColorEmoji.ttf and b/emoji/NotoColorEmoji.ttf differ -- cgit v1.2.3 From 7fbfa79c2327bfd3fe366de2e0f1d83a3f9d882b Mon Sep 17 00:00:00 2001 From: Qingqing Deng Date: Thu, 17 Oct 2019 19:16:20 +0000 Subject: Revert "Update font to unicode 12.1." This reverts commit 7278ee75f0413c2fb1d9e89f9583131b22af8bdc. Reason for revert: Change-Id: I460bea213beea72a6bb5491ca2915b6046ed33d0 --- emoji/NotoColorEmoji.ttf | Bin 10084028 -> 9384876 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/emoji/NotoColorEmoji.ttf b/emoji/NotoColorEmoji.ttf index 44e020d..3c2688f 100644 Binary files a/emoji/NotoColorEmoji.ttf and b/emoji/NotoColorEmoji.ttf differ -- cgit v1.2.3 From 379fa1be675a78fe3e3076f4792896195a1a2376 Mon Sep 17 00:00:00 2001 From: Qingqing Deng Date: Fri, 18 Oct 2019 15:42:03 -0700 Subject: Update emoji for unicode 12.1. Bug: 141714198 Test: m fontlint_chain Change-Id: I4751542fbf55f860f2905df24d3002a53e7a9166 --- emoji/NotoColorEmoji.ttf | Bin 9384876 -> 10083628 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/emoji/NotoColorEmoji.ttf b/emoji/NotoColorEmoji.ttf index 3c2688f..caf75a0 100644 Binary files a/emoji/NotoColorEmoji.ttf and b/emoji/NotoColorEmoji.ttf differ -- cgit v1.2.3 From 748c30ce6490f2917b50a97f9b9bada95e987ad3 Mon Sep 17 00:00:00 2001 From: Marek Z Jeziorek Date: Mon, 10 Feb 2020 15:12:53 +0000 Subject: New priority scripts + critical updates to fonts. Test: =================================== Test: on Android (click on a link within a browser): Test: Adlam https://en.wikipedia.org/wiki/Adlam_(Unicode_block) Test: Georgian https://en.wikipedia.org/wiki/Georgian_(Unicode_block) Test: Georgian https://en.wikipedia.org/wiki/Georgian_Extended Test: Gunjala Gondi https://en.wikipedia.org/wiki/Gunjala_Gondi_(Unicode_block) Test: Hanifi Rohingya https://en.wikipedia.org/wiki/Hanifi_Rohingya_(Unicode_block) Test: Javanese https://en.wikipedia.org/wiki/Javanese_(Unicode_block) Test: Khojki https://en.wikipedia.org/wiki/Khojki_(Unicode_block) Test: Masaram Gondi https://en.wikipedia.org/wiki/Masaram_Gondi_(Unicode_block) Test: Tifinagh https://en.wikipedia.org/wiki/Tifinagh_(Unicode_block) Test: Wancho https://en.wikipedia.org/wiki/Wancho_(Unicode_block) Test: Warang Citi https://en.wikipedia.org/wiki/Warang_Citi_(Unicode_block) Test: =================================== Test: on Android (click on a link within a browser): Test: udhr Adlam https://unicode.org/udhr/d/udhr_fuf_adlm.html Test: udhr Georgian https://unicode.org/udhr/d/udhr_kat.html Test: udhr Gunjala Gondi NA Test: udhr Hanifi Rohingya NA Test: udhr Javanese https://unicode.org/udhr/d/udhr_jav_java.html Test: udhr Khojki NA Test: udhr Masaram Gondi NA Test: udhr Tifinagh https://unicode.org/udhr/d/udhr_tzm_tfng.html Test: udhr Wancho NA Test: udhr Warang Citi NA Test: =================================== Test: on Android (comparing two systems - before/after) Test: Georgian: Systems settings menus compared side by side Test: =================================== Test: on Mac (comparing the existing Android fonts with the new font Test: using diffenator - https://github.com/googlefonts/fontdiffenator) Test: SansAdlam-VF: VALIDATED Test: SansGeorgian-VF: VALIDATED Test: SansGunjalaGondi: NEW (No Applicable) Test: SansHanifiRohingya: NEW (No Applicable) Test: SansJavanese: VALIDATED Test: SansKhojki: NEW (No Applicable) Test: SansMasaramGondi: NEW (No Applicable) Test: SansTifinagh: VALIDATED Test: SansWancho: NEW (No Applicable) Test: SansWarangCiti: NEW (No Applicable) Test: SerifGeorgian-VF: VALIDATED BUGANIZER BUGS Addressed ======================== Georgian: 111550750 Javanese: 139104208 GunjalaGondi, HanifiRohingya, Khojki, MasaramGondi, Wancho, and ... WarangCiti: 148752969 Adlam, Tifinagh: 148752946 CHANGES ======= Remove font files no longer required Replacements for the above deleted files New additions to Android fonts (living/revival languages) Change-Id: I030e650b8281e6bbbf1cb6f4131562856e8c7277 Signed-off-by: Marek Z Jeziorek --- fonts.mk | 19 +++++---- other/Android.bp | 71 +++++++++++++++++++------------ other/NotoSansAdlam-Regular.ttf | Bin 50720 -> 0 bytes other/NotoSansAdlam-VF.ttf | Bin 0 -> 103892 bytes other/NotoSansGeorgian-Bold.otf | Bin 20760 -> 0 bytes other/NotoSansGeorgian-Medium.otf | Bin 21060 -> 0 bytes other/NotoSansGeorgian-Regular.otf | Bin 19976 -> 0 bytes other/NotoSansGeorgian-VF.ttf | Bin 0 -> 66720 bytes other/NotoSansGunjalaGondi-Regular.otf | Bin 0 -> 32336 bytes other/NotoSansHanifiRohingya-Regular.otf | Bin 0 -> 13432 bytes other/NotoSansJavanese-Regular.otf | Bin 0 -> 86944 bytes other/NotoSansJavanese-Regular.ttf | Bin 37620 -> 0 bytes other/NotoSansKhojki-Regular.otf | Bin 0 -> 26928 bytes other/NotoSansMasaramGondi-Regular.otf | Bin 0 -> 23016 bytes other/NotoSansTifinagh-Regular.otf | Bin 0 -> 24924 bytes other/NotoSansTifinagh-Regular.ttf | Bin 15272 -> 0 bytes other/NotoSansWancho-Regular.otf | Bin 0 -> 14216 bytes other/NotoSansWarangCiti-Regular.otf | Bin 0 -> 20532 bytes other/NotoSerifGeorgian-Bold.otf | Bin 23620 -> 0 bytes other/NotoSerifGeorgian-Regular.otf | Bin 22320 -> 0 bytes other/NotoSerifGeorgian-VF.ttf | Bin 0 -> 80416 bytes 21 files changed, 54 insertions(+), 36 deletions(-) delete mode 100644 other/NotoSansAdlam-Regular.ttf create mode 100644 other/NotoSansAdlam-VF.ttf delete mode 100644 other/NotoSansGeorgian-Bold.otf delete mode 100644 other/NotoSansGeorgian-Medium.otf delete mode 100644 other/NotoSansGeorgian-Regular.otf create mode 100644 other/NotoSansGeorgian-VF.ttf create mode 100644 other/NotoSansGunjalaGondi-Regular.otf create mode 100644 other/NotoSansHanifiRohingya-Regular.otf create mode 100644 other/NotoSansJavanese-Regular.otf delete mode 100644 other/NotoSansJavanese-Regular.ttf create mode 100644 other/NotoSansKhojki-Regular.otf create mode 100644 other/NotoSansMasaramGondi-Regular.otf create mode 100644 other/NotoSansTifinagh-Regular.otf delete mode 100644 other/NotoSansTifinagh-Regular.ttf create mode 100644 other/NotoSansWancho-Regular.otf create mode 100644 other/NotoSansWarangCiti-Regular.otf delete mode 100644 other/NotoSerifGeorgian-Bold.otf delete mode 100644 other/NotoSerifGeorgian-Regular.otf create mode 100644 other/NotoSerifGeorgian-VF.ttf diff --git a/fonts.mk b/fonts.mk index fee43e2..13bfbfb 100644 --- a/fonts.mk +++ b/fonts.mk @@ -22,7 +22,7 @@ PRODUCT_PACKAGES := \ NotoNaskhArabic-Regular.ttf \ NotoNaskhArabicUI-Bold.ttf \ NotoNaskhArabicUI-Regular.ttf \ - NotoSansAdlam-Regular.ttf \ + NotoSansAdlam-VF.ttf \ NotoSansAhom-Regular.otf \ NotoSansAnatolianHieroglyphs-Regular.otf \ NotoSansArmenian-Bold.otf \ @@ -64,19 +64,19 @@ PRODUCT_PACKAGES := \ NotoSansElbasan-Regular.otf \ NotoSansEthiopic-Bold.ttf \ NotoSansEthiopic-Regular.ttf \ - NotoSansGeorgian-Bold.otf \ - NotoSansGeorgian-Medium.otf \ - NotoSansGeorgian-Regular.otf \ + NotoSansGeorgian-VF.ttf \ NotoSansGlagolitic-Regular.ttf \ NotoSansGothic-Regular.ttf \ NotoSansGujarati-Bold.ttf \ NotoSansGujarati-Regular.ttf \ NotoSansGujaratiUI-Bold.ttf \ NotoSansGujaratiUI-Regular.ttf \ + NotoSansGunjalaGondi-Regular.otf \ NotoSansGurmukhi-Bold.ttf \ NotoSansGurmukhi-Regular.ttf \ NotoSansGurmukhiUI-Bold.ttf \ NotoSansGurmukhiUI-Regular.ttf \ + NotoSansHanifiRohingya-Regular.otf \ NotoSansHanunoo-Regular.ttf \ NotoSansHatran-Regular.otf \ NotoSansHebrew-Bold.ttf \ @@ -84,7 +84,7 @@ PRODUCT_PACKAGES := \ NotoSansImperialAramaic-Regular.ttf \ NotoSansInscriptionalPahlavi-Regular.ttf \ NotoSansInscriptionalParthian-Regular.ttf \ - NotoSansJavanese-Regular.ttf \ + NotoSansJavanese-Regular.otf \ NotoSansKaithi-Regular.ttf \ NotoSansKannada-Bold.ttf \ NotoSansKannada-Regular.ttf \ @@ -95,6 +95,7 @@ PRODUCT_PACKAGES := \ NotoSansKhmer-VF.ttf \ NotoSansKhmerUI-Bold.ttf \ NotoSansKhmerUI-Regular.ttf \ + NotoSansKhojki-Regular.otf \ NotoSansLao-Bold.ttf \ NotoSansLao-Regular.ttf \ NotoSansLaoUI-Bold.ttf \ @@ -115,6 +116,7 @@ PRODUCT_PACKAGES := \ NotoSansMandaic-Regular.ttf \ NotoSansManichaean-Regular.otf \ NotoSansMarchen-Regular.otf \ + NotoSansMasaramGondi-Regular.otf \ NotoSansMeeteiMayek-Regular.ttf \ NotoSansMeroitic-Regular.otf \ NotoSansMiao-Regular.otf \ @@ -193,9 +195,11 @@ PRODUCT_PACKAGES := \ NotoSansThaiUI-Regular.ttf \ NotoSansTibetan-Bold.ttf \ NotoSansTibetan-Regular.ttf \ - NotoSansTifinagh-Regular.ttf \ + NotoSansTifinagh-Regular.otf \ NotoSansUgaritic-Regular.ttf \ NotoSansVai-Regular.ttf \ + NotoSansWancho-Regular.otf \ + NotoSansWarangCiti-Regular.otf \ NotoSansYi-Regular.ttf \ NotoSerif-Bold.ttf \ NotoSerif-BoldItalic.ttf \ @@ -210,8 +214,7 @@ PRODUCT_PACKAGES := \ NotoSerifDevanagari-Regular.ttf \ NotoSerifEthiopic-Bold.otf \ NotoSerifEthiopic-Regular.otf \ - NotoSerifGeorgian-Bold.otf \ - NotoSerifGeorgian-Regular.otf \ + NotoSerifGeorgian-VF.ttf \ NotoSerifGujarati-Bold.ttf \ NotoSerifGujarati-Regular.ttf \ NotoSerifGurmukhi-Bold.otf \ diff --git a/other/Android.bp b/other/Android.bp index d439501..7c2cd2b 100644 --- a/other/Android.bp +++ b/other/Android.bp @@ -33,8 +33,8 @@ prebuilt_font { } prebuilt_font { - name: "NotoSansAdlam-Regular.ttf", - src: "NotoSansAdlam-Regular.ttf", + name: "NotoSansAdlam-VF.ttf", + src: "NotoSansAdlam-VF.ttf", } prebuilt_font { @@ -268,8 +268,8 @@ prebuilt_font { } prebuilt_font { - name: "NotoSansJavanese-Regular.ttf", - src: "NotoSansJavanese-Regular.ttf", + name: "NotoSansJavanese-Regular.otf", + src: "NotoSansJavanese-Regular.otf", } prebuilt_font { @@ -777,11 +777,6 @@ prebuilt_font { src: "NotoSansTibetan-Regular.ttf", } -prebuilt_font { - name: "NotoSansTifinagh-Regular.ttf", - src: "NotoSansTifinagh-Regular.ttf", -} - prebuilt_font { name: "NotoSansUgaritic-Regular.ttf", src: "NotoSansUgaritic-Regular.ttf", @@ -863,18 +858,8 @@ prebuilt_font { } prebuilt_font { - name: "NotoSansGeorgian-Regular.otf", - src: "NotoSansGeorgian-Regular.otf", -} - -prebuilt_font { - name: "NotoSansGeorgian-Bold.otf", - src: "NotoSansGeorgian-Bold.otf", -} - -prebuilt_font { - name: "NotoSansGeorgian-Medium.otf", - src: "NotoSansGeorgian-Medium.otf", + name: "NotoSansGeorgian-VF.ttf", + src: "NotoSansGeorgian-VF.ttf", } prebuilt_font { @@ -922,6 +907,41 @@ prebuilt_font { src: "NotoSerifArmenian-Bold.otf", } +prebuilt_font { + name: "NotoSansGunjalaGondi-Regular.otf", + src: "NotoSansGunjalaGondi-Regular.otf", +} + +prebuilt_font { + name: "NotoSansHanifiRohingya-Regular.otf", + src: "NotoSansHanifiRohingya-Regular.otf", +} + +prebuilt_font { + name: "NotoSansKhojki-Regular.otf", + src: "NotoSansKhojki-Regular.otf", +} + +prebuilt_font { + name: "NotoSansMasaramGondi-Regular.otf", + src: "NotoSansMasaramGondi-Regular.otf", +} + +prebuilt_font { + name: "NotoSansTifinagh-Regular.otf", + src: "NotoSansTifinagh-Regular.otf", +} + +prebuilt_font { + name: "NotoSansWancho-Regular.otf", + src: "NotoSansWancho-Regular.otf", +} + +prebuilt_font { + name: "NotoSansWarangCiti-Regular.otf", + src: "NotoSansWarangCiti-Regular.otf", +} + prebuilt_font { name: "NotoSerifArmenian-Regular.otf", src: "NotoSerifArmenian-Regular.otf", @@ -958,13 +978,8 @@ prebuilt_font { } prebuilt_font { - name: "NotoSerifGeorgian-Bold.otf", - src: "NotoSerifGeorgian-Bold.otf", -} - -prebuilt_font { - name: "NotoSerifGeorgian-Regular.otf", - src: "NotoSerifGeorgian-Regular.otf", + name: "NotoSerifGeorgian-VF.ttf", + src: "NotoSerifGeorgian-VF.ttf", } prebuilt_font { diff --git a/other/NotoSansAdlam-Regular.ttf b/other/NotoSansAdlam-Regular.ttf deleted file mode 100644 index 20ea4ba..0000000 Binary files a/other/NotoSansAdlam-Regular.ttf and /dev/null differ diff --git a/other/NotoSansAdlam-VF.ttf b/other/NotoSansAdlam-VF.ttf new file mode 100644 index 0000000..a1c9159 Binary files /dev/null and b/other/NotoSansAdlam-VF.ttf differ diff --git a/other/NotoSansGeorgian-Bold.otf b/other/NotoSansGeorgian-Bold.otf deleted file mode 100644 index 086bd40..0000000 Binary files a/other/NotoSansGeorgian-Bold.otf and /dev/null differ diff --git a/other/NotoSansGeorgian-Medium.otf b/other/NotoSansGeorgian-Medium.otf deleted file mode 100644 index 15e5eb6..0000000 Binary files a/other/NotoSansGeorgian-Medium.otf and /dev/null differ diff --git a/other/NotoSansGeorgian-Regular.otf b/other/NotoSansGeorgian-Regular.otf deleted file mode 100644 index e59f368..0000000 Binary files a/other/NotoSansGeorgian-Regular.otf and /dev/null differ diff --git a/other/NotoSansGeorgian-VF.ttf b/other/NotoSansGeorgian-VF.ttf new file mode 100644 index 0000000..25df7f1 Binary files /dev/null and b/other/NotoSansGeorgian-VF.ttf differ diff --git a/other/NotoSansGunjalaGondi-Regular.otf b/other/NotoSansGunjalaGondi-Regular.otf new file mode 100644 index 0000000..4cc0fa3 Binary files /dev/null and b/other/NotoSansGunjalaGondi-Regular.otf differ diff --git a/other/NotoSansHanifiRohingya-Regular.otf b/other/NotoSansHanifiRohingya-Regular.otf new file mode 100644 index 0000000..f3dc231 Binary files /dev/null and b/other/NotoSansHanifiRohingya-Regular.otf differ diff --git a/other/NotoSansJavanese-Regular.otf b/other/NotoSansJavanese-Regular.otf new file mode 100644 index 0000000..e1aa665 Binary files /dev/null and b/other/NotoSansJavanese-Regular.otf differ diff --git a/other/NotoSansJavanese-Regular.ttf b/other/NotoSansJavanese-Regular.ttf deleted file mode 100644 index 2a855ed..0000000 Binary files a/other/NotoSansJavanese-Regular.ttf and /dev/null differ diff --git a/other/NotoSansKhojki-Regular.otf b/other/NotoSansKhojki-Regular.otf new file mode 100644 index 0000000..99146ac Binary files /dev/null and b/other/NotoSansKhojki-Regular.otf differ diff --git a/other/NotoSansMasaramGondi-Regular.otf b/other/NotoSansMasaramGondi-Regular.otf new file mode 100644 index 0000000..8833d01 Binary files /dev/null and b/other/NotoSansMasaramGondi-Regular.otf differ diff --git a/other/NotoSansTifinagh-Regular.otf b/other/NotoSansTifinagh-Regular.otf new file mode 100644 index 0000000..c8b87c8 Binary files /dev/null and b/other/NotoSansTifinagh-Regular.otf differ diff --git a/other/NotoSansTifinagh-Regular.ttf b/other/NotoSansTifinagh-Regular.ttf deleted file mode 100644 index 252a0dc..0000000 Binary files a/other/NotoSansTifinagh-Regular.ttf and /dev/null differ diff --git a/other/NotoSansWancho-Regular.otf b/other/NotoSansWancho-Regular.otf new file mode 100644 index 0000000..af941de Binary files /dev/null and b/other/NotoSansWancho-Regular.otf differ diff --git a/other/NotoSansWarangCiti-Regular.otf b/other/NotoSansWarangCiti-Regular.otf new file mode 100644 index 0000000..5da59fe Binary files /dev/null and b/other/NotoSansWarangCiti-Regular.otf differ diff --git a/other/NotoSerifGeorgian-Bold.otf b/other/NotoSerifGeorgian-Bold.otf deleted file mode 100644 index 1c2c01f..0000000 Binary files a/other/NotoSerifGeorgian-Bold.otf and /dev/null differ diff --git a/other/NotoSerifGeorgian-Regular.otf b/other/NotoSerifGeorgian-Regular.otf deleted file mode 100644 index f0186e6..0000000 Binary files a/other/NotoSerifGeorgian-Regular.otf and /dev/null differ diff --git a/other/NotoSerifGeorgian-VF.ttf b/other/NotoSerifGeorgian-VF.ttf new file mode 100644 index 0000000..29b0eb8 Binary files /dev/null and b/other/NotoSerifGeorgian-VF.ttf differ -- cgit v1.2.3 From ba4c95b3210a832d4ac3b0df3674b16ec1232325 Mon Sep 17 00:00:00 2001 From: Yi-Ling Chuang Date: Mon, 24 Feb 2020 01:43:09 +0000 Subject: Revert "New priority scripts + critical updates to fonts." Revert submission 10387937-system_fonts_update Reason for revert: Droidcop-triggered revert due to breakage https://android-build.googleplex.com/builds/quarterdeck?branch=git_master&target=sdk_phone_armv7-sdk&lkgb=6229266&lkbb=6230292&fkbb=6229328, bug b/150095308 Reverted Changes: I41e030b63:New priority scripts + critical updates to fonts. I030e650b8:New priority scripts + critical updates to fonts. I86d46f4b6:New priority scripts + critical updates to fonts. Change-Id: Ib74b5307fa68819535d35876f9301e6af1983063 --- fonts.mk | 19 ++++----- other/Android.bp | 71 ++++++++++++------------------- other/NotoSansAdlam-Regular.ttf | Bin 0 -> 50720 bytes other/NotoSansAdlam-VF.ttf | Bin 103892 -> 0 bytes other/NotoSansGeorgian-Bold.otf | Bin 0 -> 20760 bytes other/NotoSansGeorgian-Medium.otf | Bin 0 -> 21060 bytes other/NotoSansGeorgian-Regular.otf | Bin 0 -> 19976 bytes other/NotoSansGeorgian-VF.ttf | Bin 66720 -> 0 bytes other/NotoSansGunjalaGondi-Regular.otf | Bin 32336 -> 0 bytes other/NotoSansHanifiRohingya-Regular.otf | Bin 13432 -> 0 bytes other/NotoSansJavanese-Regular.otf | Bin 86944 -> 0 bytes other/NotoSansJavanese-Regular.ttf | Bin 0 -> 37620 bytes other/NotoSansKhojki-Regular.otf | Bin 26928 -> 0 bytes other/NotoSansMasaramGondi-Regular.otf | Bin 23016 -> 0 bytes other/NotoSansTifinagh-Regular.otf | Bin 24924 -> 0 bytes other/NotoSansTifinagh-Regular.ttf | Bin 0 -> 15272 bytes other/NotoSansWancho-Regular.otf | Bin 14216 -> 0 bytes other/NotoSansWarangCiti-Regular.otf | Bin 20532 -> 0 bytes other/NotoSerifGeorgian-Bold.otf | Bin 0 -> 23620 bytes other/NotoSerifGeorgian-Regular.otf | Bin 0 -> 22320 bytes other/NotoSerifGeorgian-VF.ttf | Bin 80416 -> 0 bytes 21 files changed, 36 insertions(+), 54 deletions(-) create mode 100644 other/NotoSansAdlam-Regular.ttf delete mode 100644 other/NotoSansAdlam-VF.ttf create mode 100644 other/NotoSansGeorgian-Bold.otf create mode 100644 other/NotoSansGeorgian-Medium.otf create mode 100644 other/NotoSansGeorgian-Regular.otf delete mode 100644 other/NotoSansGeorgian-VF.ttf delete mode 100644 other/NotoSansGunjalaGondi-Regular.otf delete mode 100644 other/NotoSansHanifiRohingya-Regular.otf delete mode 100644 other/NotoSansJavanese-Regular.otf create mode 100644 other/NotoSansJavanese-Regular.ttf delete mode 100644 other/NotoSansKhojki-Regular.otf delete mode 100644 other/NotoSansMasaramGondi-Regular.otf delete mode 100644 other/NotoSansTifinagh-Regular.otf create mode 100644 other/NotoSansTifinagh-Regular.ttf delete mode 100644 other/NotoSansWancho-Regular.otf delete mode 100644 other/NotoSansWarangCiti-Regular.otf create mode 100644 other/NotoSerifGeorgian-Bold.otf create mode 100644 other/NotoSerifGeorgian-Regular.otf delete mode 100644 other/NotoSerifGeorgian-VF.ttf diff --git a/fonts.mk b/fonts.mk index 13bfbfb..fee43e2 100644 --- a/fonts.mk +++ b/fonts.mk @@ -22,7 +22,7 @@ PRODUCT_PACKAGES := \ NotoNaskhArabic-Regular.ttf \ NotoNaskhArabicUI-Bold.ttf \ NotoNaskhArabicUI-Regular.ttf \ - NotoSansAdlam-VF.ttf \ + NotoSansAdlam-Regular.ttf \ NotoSansAhom-Regular.otf \ NotoSansAnatolianHieroglyphs-Regular.otf \ NotoSansArmenian-Bold.otf \ @@ -64,19 +64,19 @@ PRODUCT_PACKAGES := \ NotoSansElbasan-Regular.otf \ NotoSansEthiopic-Bold.ttf \ NotoSansEthiopic-Regular.ttf \ - NotoSansGeorgian-VF.ttf \ + NotoSansGeorgian-Bold.otf \ + NotoSansGeorgian-Medium.otf \ + NotoSansGeorgian-Regular.otf \ NotoSansGlagolitic-Regular.ttf \ NotoSansGothic-Regular.ttf \ NotoSansGujarati-Bold.ttf \ NotoSansGujarati-Regular.ttf \ NotoSansGujaratiUI-Bold.ttf \ NotoSansGujaratiUI-Regular.ttf \ - NotoSansGunjalaGondi-Regular.otf \ NotoSansGurmukhi-Bold.ttf \ NotoSansGurmukhi-Regular.ttf \ NotoSansGurmukhiUI-Bold.ttf \ NotoSansGurmukhiUI-Regular.ttf \ - NotoSansHanifiRohingya-Regular.otf \ NotoSansHanunoo-Regular.ttf \ NotoSansHatran-Regular.otf \ NotoSansHebrew-Bold.ttf \ @@ -84,7 +84,7 @@ PRODUCT_PACKAGES := \ NotoSansImperialAramaic-Regular.ttf \ NotoSansInscriptionalPahlavi-Regular.ttf \ NotoSansInscriptionalParthian-Regular.ttf \ - NotoSansJavanese-Regular.otf \ + NotoSansJavanese-Regular.ttf \ NotoSansKaithi-Regular.ttf \ NotoSansKannada-Bold.ttf \ NotoSansKannada-Regular.ttf \ @@ -95,7 +95,6 @@ PRODUCT_PACKAGES := \ NotoSansKhmer-VF.ttf \ NotoSansKhmerUI-Bold.ttf \ NotoSansKhmerUI-Regular.ttf \ - NotoSansKhojki-Regular.otf \ NotoSansLao-Bold.ttf \ NotoSansLao-Regular.ttf \ NotoSansLaoUI-Bold.ttf \ @@ -116,7 +115,6 @@ PRODUCT_PACKAGES := \ NotoSansMandaic-Regular.ttf \ NotoSansManichaean-Regular.otf \ NotoSansMarchen-Regular.otf \ - NotoSansMasaramGondi-Regular.otf \ NotoSansMeeteiMayek-Regular.ttf \ NotoSansMeroitic-Regular.otf \ NotoSansMiao-Regular.otf \ @@ -195,11 +193,9 @@ PRODUCT_PACKAGES := \ NotoSansThaiUI-Regular.ttf \ NotoSansTibetan-Bold.ttf \ NotoSansTibetan-Regular.ttf \ - NotoSansTifinagh-Regular.otf \ + NotoSansTifinagh-Regular.ttf \ NotoSansUgaritic-Regular.ttf \ NotoSansVai-Regular.ttf \ - NotoSansWancho-Regular.otf \ - NotoSansWarangCiti-Regular.otf \ NotoSansYi-Regular.ttf \ NotoSerif-Bold.ttf \ NotoSerif-BoldItalic.ttf \ @@ -214,7 +210,8 @@ PRODUCT_PACKAGES := \ NotoSerifDevanagari-Regular.ttf \ NotoSerifEthiopic-Bold.otf \ NotoSerifEthiopic-Regular.otf \ - NotoSerifGeorgian-VF.ttf \ + NotoSerifGeorgian-Bold.otf \ + NotoSerifGeorgian-Regular.otf \ NotoSerifGujarati-Bold.ttf \ NotoSerifGujarati-Regular.ttf \ NotoSerifGurmukhi-Bold.otf \ diff --git a/other/Android.bp b/other/Android.bp index 7c2cd2b..d439501 100644 --- a/other/Android.bp +++ b/other/Android.bp @@ -33,8 +33,8 @@ prebuilt_font { } prebuilt_font { - name: "NotoSansAdlam-VF.ttf", - src: "NotoSansAdlam-VF.ttf", + name: "NotoSansAdlam-Regular.ttf", + src: "NotoSansAdlam-Regular.ttf", } prebuilt_font { @@ -268,8 +268,8 @@ prebuilt_font { } prebuilt_font { - name: "NotoSansJavanese-Regular.otf", - src: "NotoSansJavanese-Regular.otf", + name: "NotoSansJavanese-Regular.ttf", + src: "NotoSansJavanese-Regular.ttf", } prebuilt_font { @@ -777,6 +777,11 @@ prebuilt_font { src: "NotoSansTibetan-Regular.ttf", } +prebuilt_font { + name: "NotoSansTifinagh-Regular.ttf", + src: "NotoSansTifinagh-Regular.ttf", +} + prebuilt_font { name: "NotoSansUgaritic-Regular.ttf", src: "NotoSansUgaritic-Regular.ttf", @@ -858,8 +863,18 @@ prebuilt_font { } prebuilt_font { - name: "NotoSansGeorgian-VF.ttf", - src: "NotoSansGeorgian-VF.ttf", + name: "NotoSansGeorgian-Regular.otf", + src: "NotoSansGeorgian-Regular.otf", +} + +prebuilt_font { + name: "NotoSansGeorgian-Bold.otf", + src: "NotoSansGeorgian-Bold.otf", +} + +prebuilt_font { + name: "NotoSansGeorgian-Medium.otf", + src: "NotoSansGeorgian-Medium.otf", } prebuilt_font { @@ -907,41 +922,6 @@ prebuilt_font { src: "NotoSerifArmenian-Bold.otf", } -prebuilt_font { - name: "NotoSansGunjalaGondi-Regular.otf", - src: "NotoSansGunjalaGondi-Regular.otf", -} - -prebuilt_font { - name: "NotoSansHanifiRohingya-Regular.otf", - src: "NotoSansHanifiRohingya-Regular.otf", -} - -prebuilt_font { - name: "NotoSansKhojki-Regular.otf", - src: "NotoSansKhojki-Regular.otf", -} - -prebuilt_font { - name: "NotoSansMasaramGondi-Regular.otf", - src: "NotoSansMasaramGondi-Regular.otf", -} - -prebuilt_font { - name: "NotoSansTifinagh-Regular.otf", - src: "NotoSansTifinagh-Regular.otf", -} - -prebuilt_font { - name: "NotoSansWancho-Regular.otf", - src: "NotoSansWancho-Regular.otf", -} - -prebuilt_font { - name: "NotoSansWarangCiti-Regular.otf", - src: "NotoSansWarangCiti-Regular.otf", -} - prebuilt_font { name: "NotoSerifArmenian-Regular.otf", src: "NotoSerifArmenian-Regular.otf", @@ -978,8 +958,13 @@ prebuilt_font { } prebuilt_font { - name: "NotoSerifGeorgian-VF.ttf", - src: "NotoSerifGeorgian-VF.ttf", + name: "NotoSerifGeorgian-Bold.otf", + src: "NotoSerifGeorgian-Bold.otf", +} + +prebuilt_font { + name: "NotoSerifGeorgian-Regular.otf", + src: "NotoSerifGeorgian-Regular.otf", } prebuilt_font { diff --git a/other/NotoSansAdlam-Regular.ttf b/other/NotoSansAdlam-Regular.ttf new file mode 100644 index 0000000..20ea4ba Binary files /dev/null and b/other/NotoSansAdlam-Regular.ttf differ diff --git a/other/NotoSansAdlam-VF.ttf b/other/NotoSansAdlam-VF.ttf deleted file mode 100644 index a1c9159..0000000 Binary files a/other/NotoSansAdlam-VF.ttf and /dev/null differ diff --git a/other/NotoSansGeorgian-Bold.otf b/other/NotoSansGeorgian-Bold.otf new file mode 100644 index 0000000..086bd40 Binary files /dev/null and b/other/NotoSansGeorgian-Bold.otf differ diff --git a/other/NotoSansGeorgian-Medium.otf b/other/NotoSansGeorgian-Medium.otf new file mode 100644 index 0000000..15e5eb6 Binary files /dev/null and b/other/NotoSansGeorgian-Medium.otf differ diff --git a/other/NotoSansGeorgian-Regular.otf b/other/NotoSansGeorgian-Regular.otf new file mode 100644 index 0000000..e59f368 Binary files /dev/null and b/other/NotoSansGeorgian-Regular.otf differ diff --git a/other/NotoSansGeorgian-VF.ttf b/other/NotoSansGeorgian-VF.ttf deleted file mode 100644 index 25df7f1..0000000 Binary files a/other/NotoSansGeorgian-VF.ttf and /dev/null differ diff --git a/other/NotoSansGunjalaGondi-Regular.otf b/other/NotoSansGunjalaGondi-Regular.otf deleted file mode 100644 index 4cc0fa3..0000000 Binary files a/other/NotoSansGunjalaGondi-Regular.otf and /dev/null differ diff --git a/other/NotoSansHanifiRohingya-Regular.otf b/other/NotoSansHanifiRohingya-Regular.otf deleted file mode 100644 index f3dc231..0000000 Binary files a/other/NotoSansHanifiRohingya-Regular.otf and /dev/null differ diff --git a/other/NotoSansJavanese-Regular.otf b/other/NotoSansJavanese-Regular.otf deleted file mode 100644 index e1aa665..0000000 Binary files a/other/NotoSansJavanese-Regular.otf and /dev/null differ diff --git a/other/NotoSansJavanese-Regular.ttf b/other/NotoSansJavanese-Regular.ttf new file mode 100644 index 0000000..2a855ed Binary files /dev/null and b/other/NotoSansJavanese-Regular.ttf differ diff --git a/other/NotoSansKhojki-Regular.otf b/other/NotoSansKhojki-Regular.otf deleted file mode 100644 index 99146ac..0000000 Binary files a/other/NotoSansKhojki-Regular.otf and /dev/null differ diff --git a/other/NotoSansMasaramGondi-Regular.otf b/other/NotoSansMasaramGondi-Regular.otf deleted file mode 100644 index 8833d01..0000000 Binary files a/other/NotoSansMasaramGondi-Regular.otf and /dev/null differ diff --git a/other/NotoSansTifinagh-Regular.otf b/other/NotoSansTifinagh-Regular.otf deleted file mode 100644 index c8b87c8..0000000 Binary files a/other/NotoSansTifinagh-Regular.otf and /dev/null differ diff --git a/other/NotoSansTifinagh-Regular.ttf b/other/NotoSansTifinagh-Regular.ttf new file mode 100644 index 0000000..252a0dc Binary files /dev/null and b/other/NotoSansTifinagh-Regular.ttf differ diff --git a/other/NotoSansWancho-Regular.otf b/other/NotoSansWancho-Regular.otf deleted file mode 100644 index af941de..0000000 Binary files a/other/NotoSansWancho-Regular.otf and /dev/null differ diff --git a/other/NotoSansWarangCiti-Regular.otf b/other/NotoSansWarangCiti-Regular.otf deleted file mode 100644 index 5da59fe..0000000 Binary files a/other/NotoSansWarangCiti-Regular.otf and /dev/null differ diff --git a/other/NotoSerifGeorgian-Bold.otf b/other/NotoSerifGeorgian-Bold.otf new file mode 100644 index 0000000..1c2c01f Binary files /dev/null and b/other/NotoSerifGeorgian-Bold.otf differ diff --git a/other/NotoSerifGeorgian-Regular.otf b/other/NotoSerifGeorgian-Regular.otf new file mode 100644 index 0000000..f0186e6 Binary files /dev/null and b/other/NotoSerifGeorgian-Regular.otf differ diff --git a/other/NotoSerifGeorgian-VF.ttf b/other/NotoSerifGeorgian-VF.ttf deleted file mode 100644 index 29b0eb8..0000000 Binary files a/other/NotoSerifGeorgian-VF.ttf and /dev/null differ -- cgit v1.2.3 From 47bf7500c880955dbff85fec51100e9a038bc990 Mon Sep 17 00:00:00 2001 From: Marek Jeziorek Date: Wed, 26 Feb 2020 16:43:36 +0000 Subject: Revert^2 "New priority scripts + critical updates to fonts." After https://googleplex-android-review.git.corp.google.com/q/I403a72608ad3a1034e52a51b73871e08cf6283a4 merger this change should be fine. ba4c95b3210a832d4ac3b0df3674b16ec1232325 Change-Id: I303abcff3e2666d2678a3519faf32ee134ef3e7d --- fonts.mk | 19 +++++---- other/Android.bp | 71 +++++++++++++++++++------------ other/NotoSansAdlam-Regular.ttf | Bin 50720 -> 0 bytes other/NotoSansAdlam-VF.ttf | Bin 0 -> 103892 bytes other/NotoSansGeorgian-Bold.otf | Bin 20760 -> 0 bytes other/NotoSansGeorgian-Medium.otf | Bin 21060 -> 0 bytes other/NotoSansGeorgian-Regular.otf | Bin 19976 -> 0 bytes other/NotoSansGeorgian-VF.ttf | Bin 0 -> 66720 bytes other/NotoSansGunjalaGondi-Regular.otf | Bin 0 -> 32336 bytes other/NotoSansHanifiRohingya-Regular.otf | Bin 0 -> 13432 bytes other/NotoSansJavanese-Regular.otf | Bin 0 -> 86944 bytes other/NotoSansJavanese-Regular.ttf | Bin 37620 -> 0 bytes other/NotoSansKhojki-Regular.otf | Bin 0 -> 26928 bytes other/NotoSansMasaramGondi-Regular.otf | Bin 0 -> 23016 bytes other/NotoSansTifinagh-Regular.otf | Bin 0 -> 24924 bytes other/NotoSansTifinagh-Regular.ttf | Bin 15272 -> 0 bytes other/NotoSansWancho-Regular.otf | Bin 0 -> 14216 bytes other/NotoSansWarangCiti-Regular.otf | Bin 0 -> 20532 bytes other/NotoSerifGeorgian-Bold.otf | Bin 23620 -> 0 bytes other/NotoSerifGeorgian-Regular.otf | Bin 22320 -> 0 bytes other/NotoSerifGeorgian-VF.ttf | Bin 0 -> 80416 bytes 21 files changed, 54 insertions(+), 36 deletions(-) delete mode 100644 other/NotoSansAdlam-Regular.ttf create mode 100644 other/NotoSansAdlam-VF.ttf delete mode 100644 other/NotoSansGeorgian-Bold.otf delete mode 100644 other/NotoSansGeorgian-Medium.otf delete mode 100644 other/NotoSansGeorgian-Regular.otf create mode 100644 other/NotoSansGeorgian-VF.ttf create mode 100644 other/NotoSansGunjalaGondi-Regular.otf create mode 100644 other/NotoSansHanifiRohingya-Regular.otf create mode 100644 other/NotoSansJavanese-Regular.otf delete mode 100644 other/NotoSansJavanese-Regular.ttf create mode 100644 other/NotoSansKhojki-Regular.otf create mode 100644 other/NotoSansMasaramGondi-Regular.otf create mode 100644 other/NotoSansTifinagh-Regular.otf delete mode 100644 other/NotoSansTifinagh-Regular.ttf create mode 100644 other/NotoSansWancho-Regular.otf create mode 100644 other/NotoSansWarangCiti-Regular.otf delete mode 100644 other/NotoSerifGeorgian-Bold.otf delete mode 100644 other/NotoSerifGeorgian-Regular.otf create mode 100644 other/NotoSerifGeorgian-VF.ttf diff --git a/fonts.mk b/fonts.mk index fee43e2..13bfbfb 100644 --- a/fonts.mk +++ b/fonts.mk @@ -22,7 +22,7 @@ PRODUCT_PACKAGES := \ NotoNaskhArabic-Regular.ttf \ NotoNaskhArabicUI-Bold.ttf \ NotoNaskhArabicUI-Regular.ttf \ - NotoSansAdlam-Regular.ttf \ + NotoSansAdlam-VF.ttf \ NotoSansAhom-Regular.otf \ NotoSansAnatolianHieroglyphs-Regular.otf \ NotoSansArmenian-Bold.otf \ @@ -64,19 +64,19 @@ PRODUCT_PACKAGES := \ NotoSansElbasan-Regular.otf \ NotoSansEthiopic-Bold.ttf \ NotoSansEthiopic-Regular.ttf \ - NotoSansGeorgian-Bold.otf \ - NotoSansGeorgian-Medium.otf \ - NotoSansGeorgian-Regular.otf \ + NotoSansGeorgian-VF.ttf \ NotoSansGlagolitic-Regular.ttf \ NotoSansGothic-Regular.ttf \ NotoSansGujarati-Bold.ttf \ NotoSansGujarati-Regular.ttf \ NotoSansGujaratiUI-Bold.ttf \ NotoSansGujaratiUI-Regular.ttf \ + NotoSansGunjalaGondi-Regular.otf \ NotoSansGurmukhi-Bold.ttf \ NotoSansGurmukhi-Regular.ttf \ NotoSansGurmukhiUI-Bold.ttf \ NotoSansGurmukhiUI-Regular.ttf \ + NotoSansHanifiRohingya-Regular.otf \ NotoSansHanunoo-Regular.ttf \ NotoSansHatran-Regular.otf \ NotoSansHebrew-Bold.ttf \ @@ -84,7 +84,7 @@ PRODUCT_PACKAGES := \ NotoSansImperialAramaic-Regular.ttf \ NotoSansInscriptionalPahlavi-Regular.ttf \ NotoSansInscriptionalParthian-Regular.ttf \ - NotoSansJavanese-Regular.ttf \ + NotoSansJavanese-Regular.otf \ NotoSansKaithi-Regular.ttf \ NotoSansKannada-Bold.ttf \ NotoSansKannada-Regular.ttf \ @@ -95,6 +95,7 @@ PRODUCT_PACKAGES := \ NotoSansKhmer-VF.ttf \ NotoSansKhmerUI-Bold.ttf \ NotoSansKhmerUI-Regular.ttf \ + NotoSansKhojki-Regular.otf \ NotoSansLao-Bold.ttf \ NotoSansLao-Regular.ttf \ NotoSansLaoUI-Bold.ttf \ @@ -115,6 +116,7 @@ PRODUCT_PACKAGES := \ NotoSansMandaic-Regular.ttf \ NotoSansManichaean-Regular.otf \ NotoSansMarchen-Regular.otf \ + NotoSansMasaramGondi-Regular.otf \ NotoSansMeeteiMayek-Regular.ttf \ NotoSansMeroitic-Regular.otf \ NotoSansMiao-Regular.otf \ @@ -193,9 +195,11 @@ PRODUCT_PACKAGES := \ NotoSansThaiUI-Regular.ttf \ NotoSansTibetan-Bold.ttf \ NotoSansTibetan-Regular.ttf \ - NotoSansTifinagh-Regular.ttf \ + NotoSansTifinagh-Regular.otf \ NotoSansUgaritic-Regular.ttf \ NotoSansVai-Regular.ttf \ + NotoSansWancho-Regular.otf \ + NotoSansWarangCiti-Regular.otf \ NotoSansYi-Regular.ttf \ NotoSerif-Bold.ttf \ NotoSerif-BoldItalic.ttf \ @@ -210,8 +214,7 @@ PRODUCT_PACKAGES := \ NotoSerifDevanagari-Regular.ttf \ NotoSerifEthiopic-Bold.otf \ NotoSerifEthiopic-Regular.otf \ - NotoSerifGeorgian-Bold.otf \ - NotoSerifGeorgian-Regular.otf \ + NotoSerifGeorgian-VF.ttf \ NotoSerifGujarati-Bold.ttf \ NotoSerifGujarati-Regular.ttf \ NotoSerifGurmukhi-Bold.otf \ diff --git a/other/Android.bp b/other/Android.bp index d439501..7c2cd2b 100644 --- a/other/Android.bp +++ b/other/Android.bp @@ -33,8 +33,8 @@ prebuilt_font { } prebuilt_font { - name: "NotoSansAdlam-Regular.ttf", - src: "NotoSansAdlam-Regular.ttf", + name: "NotoSansAdlam-VF.ttf", + src: "NotoSansAdlam-VF.ttf", } prebuilt_font { @@ -268,8 +268,8 @@ prebuilt_font { } prebuilt_font { - name: "NotoSansJavanese-Regular.ttf", - src: "NotoSansJavanese-Regular.ttf", + name: "NotoSansJavanese-Regular.otf", + src: "NotoSansJavanese-Regular.otf", } prebuilt_font { @@ -777,11 +777,6 @@ prebuilt_font { src: "NotoSansTibetan-Regular.ttf", } -prebuilt_font { - name: "NotoSansTifinagh-Regular.ttf", - src: "NotoSansTifinagh-Regular.ttf", -} - prebuilt_font { name: "NotoSansUgaritic-Regular.ttf", src: "NotoSansUgaritic-Regular.ttf", @@ -863,18 +858,8 @@ prebuilt_font { } prebuilt_font { - name: "NotoSansGeorgian-Regular.otf", - src: "NotoSansGeorgian-Regular.otf", -} - -prebuilt_font { - name: "NotoSansGeorgian-Bold.otf", - src: "NotoSansGeorgian-Bold.otf", -} - -prebuilt_font { - name: "NotoSansGeorgian-Medium.otf", - src: "NotoSansGeorgian-Medium.otf", + name: "NotoSansGeorgian-VF.ttf", + src: "NotoSansGeorgian-VF.ttf", } prebuilt_font { @@ -922,6 +907,41 @@ prebuilt_font { src: "NotoSerifArmenian-Bold.otf", } +prebuilt_font { + name: "NotoSansGunjalaGondi-Regular.otf", + src: "NotoSansGunjalaGondi-Regular.otf", +} + +prebuilt_font { + name: "NotoSansHanifiRohingya-Regular.otf", + src: "NotoSansHanifiRohingya-Regular.otf", +} + +prebuilt_font { + name: "NotoSansKhojki-Regular.otf", + src: "NotoSansKhojki-Regular.otf", +} + +prebuilt_font { + name: "NotoSansMasaramGondi-Regular.otf", + src: "NotoSansMasaramGondi-Regular.otf", +} + +prebuilt_font { + name: "NotoSansTifinagh-Regular.otf", + src: "NotoSansTifinagh-Regular.otf", +} + +prebuilt_font { + name: "NotoSansWancho-Regular.otf", + src: "NotoSansWancho-Regular.otf", +} + +prebuilt_font { + name: "NotoSansWarangCiti-Regular.otf", + src: "NotoSansWarangCiti-Regular.otf", +} + prebuilt_font { name: "NotoSerifArmenian-Regular.otf", src: "NotoSerifArmenian-Regular.otf", @@ -958,13 +978,8 @@ prebuilt_font { } prebuilt_font { - name: "NotoSerifGeorgian-Bold.otf", - src: "NotoSerifGeorgian-Bold.otf", -} - -prebuilt_font { - name: "NotoSerifGeorgian-Regular.otf", - src: "NotoSerifGeorgian-Regular.otf", + name: "NotoSerifGeorgian-VF.ttf", + src: "NotoSerifGeorgian-VF.ttf", } prebuilt_font { diff --git a/other/NotoSansAdlam-Regular.ttf b/other/NotoSansAdlam-Regular.ttf deleted file mode 100644 index 20ea4ba..0000000 Binary files a/other/NotoSansAdlam-Regular.ttf and /dev/null differ diff --git a/other/NotoSansAdlam-VF.ttf b/other/NotoSansAdlam-VF.ttf new file mode 100644 index 0000000..a1c9159 Binary files /dev/null and b/other/NotoSansAdlam-VF.ttf differ diff --git a/other/NotoSansGeorgian-Bold.otf b/other/NotoSansGeorgian-Bold.otf deleted file mode 100644 index 086bd40..0000000 Binary files a/other/NotoSansGeorgian-Bold.otf and /dev/null differ diff --git a/other/NotoSansGeorgian-Medium.otf b/other/NotoSansGeorgian-Medium.otf deleted file mode 100644 index 15e5eb6..0000000 Binary files a/other/NotoSansGeorgian-Medium.otf and /dev/null differ diff --git a/other/NotoSansGeorgian-Regular.otf b/other/NotoSansGeorgian-Regular.otf deleted file mode 100644 index e59f368..0000000 Binary files a/other/NotoSansGeorgian-Regular.otf and /dev/null differ diff --git a/other/NotoSansGeorgian-VF.ttf b/other/NotoSansGeorgian-VF.ttf new file mode 100644 index 0000000..25df7f1 Binary files /dev/null and b/other/NotoSansGeorgian-VF.ttf differ diff --git a/other/NotoSansGunjalaGondi-Regular.otf b/other/NotoSansGunjalaGondi-Regular.otf new file mode 100644 index 0000000..4cc0fa3 Binary files /dev/null and b/other/NotoSansGunjalaGondi-Regular.otf differ diff --git a/other/NotoSansHanifiRohingya-Regular.otf b/other/NotoSansHanifiRohingya-Regular.otf new file mode 100644 index 0000000..f3dc231 Binary files /dev/null and b/other/NotoSansHanifiRohingya-Regular.otf differ diff --git a/other/NotoSansJavanese-Regular.otf b/other/NotoSansJavanese-Regular.otf new file mode 100644 index 0000000..e1aa665 Binary files /dev/null and b/other/NotoSansJavanese-Regular.otf differ diff --git a/other/NotoSansJavanese-Regular.ttf b/other/NotoSansJavanese-Regular.ttf deleted file mode 100644 index 2a855ed..0000000 Binary files a/other/NotoSansJavanese-Regular.ttf and /dev/null differ diff --git a/other/NotoSansKhojki-Regular.otf b/other/NotoSansKhojki-Regular.otf new file mode 100644 index 0000000..99146ac Binary files /dev/null and b/other/NotoSansKhojki-Regular.otf differ diff --git a/other/NotoSansMasaramGondi-Regular.otf b/other/NotoSansMasaramGondi-Regular.otf new file mode 100644 index 0000000..8833d01 Binary files /dev/null and b/other/NotoSansMasaramGondi-Regular.otf differ diff --git a/other/NotoSansTifinagh-Regular.otf b/other/NotoSansTifinagh-Regular.otf new file mode 100644 index 0000000..c8b87c8 Binary files /dev/null and b/other/NotoSansTifinagh-Regular.otf differ diff --git a/other/NotoSansTifinagh-Regular.ttf b/other/NotoSansTifinagh-Regular.ttf deleted file mode 100644 index 252a0dc..0000000 Binary files a/other/NotoSansTifinagh-Regular.ttf and /dev/null differ diff --git a/other/NotoSansWancho-Regular.otf b/other/NotoSansWancho-Regular.otf new file mode 100644 index 0000000..af941de Binary files /dev/null and b/other/NotoSansWancho-Regular.otf differ diff --git a/other/NotoSansWarangCiti-Regular.otf b/other/NotoSansWarangCiti-Regular.otf new file mode 100644 index 0000000..5da59fe Binary files /dev/null and b/other/NotoSansWarangCiti-Regular.otf differ diff --git a/other/NotoSerifGeorgian-Bold.otf b/other/NotoSerifGeorgian-Bold.otf deleted file mode 100644 index 1c2c01f..0000000 Binary files a/other/NotoSerifGeorgian-Bold.otf and /dev/null differ diff --git a/other/NotoSerifGeorgian-Regular.otf b/other/NotoSerifGeorgian-Regular.otf deleted file mode 100644 index f0186e6..0000000 Binary files a/other/NotoSerifGeorgian-Regular.otf and /dev/null differ diff --git a/other/NotoSerifGeorgian-VF.ttf b/other/NotoSerifGeorgian-VF.ttf new file mode 100644 index 0000000..29b0eb8 Binary files /dev/null and b/other/NotoSerifGeorgian-VF.ttf differ -- cgit v1.2.3 From d0c9eb5818b46ef3ba90b0b5486301fc7ccdab14 Mon Sep 17 00:00:00 2001 From: Marek Z Jeziorek Date: Mon, 10 Feb 2020 15:12:53 +0000 Subject: New priority scripts + critical updates to fonts. BUGANIZER BUGS Addressed ======================== BUG: 149257053 Test: =================================== Test: on Android (click on a link within a browser): Test: Adlam https://en.wikipedia.org/wiki/Adlam_(Unicode_block) Test: Georgian https://en.wikipedia.org/wiki/Georgian_(Unicode_block) Test: Georgian https://en.wikipedia.org/wiki/Georgian_Extended Test: Gunjala Gondi https://en.wikipedia.org/wiki/Gunjala_Gondi_(Unicode_block) Test: Hanifi Rohingya https://en.wikipedia.org/wiki/Hanifi_Rohingya_(Unicode_block) Test: Javanese https://en.wikipedia.org/wiki/Javanese_(Unicode_block) Test: Khojki https://en.wikipedia.org/wiki/Khojki_(Unicode_block) Test: Masaram Gondi https://en.wikipedia.org/wiki/Masaram_Gondi_(Unicode_block) Test: Tifinagh https://en.wikipedia.org/wiki/Tifinagh_(Unicode_block) Test: Wancho https://en.wikipedia.org/wiki/Wancho_(Unicode_block) Test: Warang Citi https://en.wikipedia.org/wiki/Warang_Citi_(Unicode_block) Test: =================================== Test: on Android (click on a link within a browser): Test: udhr Adlam https://unicode.org/udhr/d/udhr_fuf_adlm.html Test: udhr Georgian https://unicode.org/udhr/d/udhr_kat.html Test: udhr Gunjala Gondi NA Test: udhr Hanifi Rohingya NA Test: udhr Javanese https://unicode.org/udhr/d/udhr_jav_java.html Test: udhr Khojki NA Test: udhr Masaram Gondi NA Test: udhr Tifinagh https://unicode.org/udhr/d/udhr_tzm_tfng.html Test: udhr Wancho NA Test: udhr Warang Citi NA Test: =================================== Test: on Android (comparing two systems - before/after) Test: Georgian: Systems settings menus compared side by side Test: =================================== Test: on Mac (comparing the existing Android fonts with the new font Test: using diffenator - https://github.com/googlefonts/fontdiffenator) Test: SansAdlam-VF: VALIDATED Test: SansGeorgian-VF: VALIDATED Test: SansGunjalaGondi: NEW (No Applicable) Test: SansHanifiRohingya: NEW (No Applicable) Test: SansJavanese: VALIDATED Test: SansKhojki: NEW (No Applicable) Test: SansMasaramGondi: NEW (No Applicable) Test: SansTifinagh: VALIDATED Test: SansWancho: NEW (No Applicable) Test: SansWarangCiti: NEW (No Applicable) Test: SerifGeorgian-VF: VALIDATED CHANGES ======= Remove font files no longer required Replacements for the above deleted files New additions to Android fonts (living/revival languages) Change-Id: I030e650b8281e6bbbf1cb6f4131562856e8c7277 Signed-off-by: Marek Z Jeziorek (cherry picked from commit 748c30ce6490f2917b50a97f9b9bada95e987ad3) --- fonts.mk | 19 +++++---- other/Android.bp | 71 +++++++++++++++++++------------ other/NotoSansAdlam-Regular.ttf | Bin 50720 -> 0 bytes other/NotoSansAdlam-VF.ttf | Bin 0 -> 103892 bytes other/NotoSansGeorgian-Bold.otf | Bin 20760 -> 0 bytes other/NotoSansGeorgian-Medium.otf | Bin 21060 -> 0 bytes other/NotoSansGeorgian-Regular.otf | Bin 19976 -> 0 bytes other/NotoSansGeorgian-VF.ttf | Bin 0 -> 66720 bytes other/NotoSansGunjalaGondi-Regular.otf | Bin 0 -> 32336 bytes other/NotoSansHanifiRohingya-Regular.otf | Bin 0 -> 13432 bytes other/NotoSansJavanese-Regular.otf | Bin 0 -> 86944 bytes other/NotoSansJavanese-Regular.ttf | Bin 37620 -> 0 bytes other/NotoSansKhojki-Regular.otf | Bin 0 -> 26928 bytes other/NotoSansMasaramGondi-Regular.otf | Bin 0 -> 23016 bytes other/NotoSansTifinagh-Regular.otf | Bin 0 -> 24924 bytes other/NotoSansTifinagh-Regular.ttf | Bin 15272 -> 0 bytes other/NotoSansWancho-Regular.otf | Bin 0 -> 14216 bytes other/NotoSansWarangCiti-Regular.otf | Bin 0 -> 20532 bytes other/NotoSerifGeorgian-Bold.otf | Bin 23620 -> 0 bytes other/NotoSerifGeorgian-Regular.otf | Bin 22320 -> 0 bytes other/NotoSerifGeorgian-VF.ttf | Bin 0 -> 80416 bytes 21 files changed, 54 insertions(+), 36 deletions(-) delete mode 100644 other/NotoSansAdlam-Regular.ttf create mode 100644 other/NotoSansAdlam-VF.ttf delete mode 100644 other/NotoSansGeorgian-Bold.otf delete mode 100644 other/NotoSansGeorgian-Medium.otf delete mode 100644 other/NotoSansGeorgian-Regular.otf create mode 100644 other/NotoSansGeorgian-VF.ttf create mode 100644 other/NotoSansGunjalaGondi-Regular.otf create mode 100644 other/NotoSansHanifiRohingya-Regular.otf create mode 100644 other/NotoSansJavanese-Regular.otf delete mode 100644 other/NotoSansJavanese-Regular.ttf create mode 100644 other/NotoSansKhojki-Regular.otf create mode 100644 other/NotoSansMasaramGondi-Regular.otf create mode 100644 other/NotoSansTifinagh-Regular.otf delete mode 100644 other/NotoSansTifinagh-Regular.ttf create mode 100644 other/NotoSansWancho-Regular.otf create mode 100644 other/NotoSansWarangCiti-Regular.otf delete mode 100644 other/NotoSerifGeorgian-Bold.otf delete mode 100644 other/NotoSerifGeorgian-Regular.otf create mode 100644 other/NotoSerifGeorgian-VF.ttf diff --git a/fonts.mk b/fonts.mk index fee43e2..13bfbfb 100644 --- a/fonts.mk +++ b/fonts.mk @@ -22,7 +22,7 @@ PRODUCT_PACKAGES := \ NotoNaskhArabic-Regular.ttf \ NotoNaskhArabicUI-Bold.ttf \ NotoNaskhArabicUI-Regular.ttf \ - NotoSansAdlam-Regular.ttf \ + NotoSansAdlam-VF.ttf \ NotoSansAhom-Regular.otf \ NotoSansAnatolianHieroglyphs-Regular.otf \ NotoSansArmenian-Bold.otf \ @@ -64,19 +64,19 @@ PRODUCT_PACKAGES := \ NotoSansElbasan-Regular.otf \ NotoSansEthiopic-Bold.ttf \ NotoSansEthiopic-Regular.ttf \ - NotoSansGeorgian-Bold.otf \ - NotoSansGeorgian-Medium.otf \ - NotoSansGeorgian-Regular.otf \ + NotoSansGeorgian-VF.ttf \ NotoSansGlagolitic-Regular.ttf \ NotoSansGothic-Regular.ttf \ NotoSansGujarati-Bold.ttf \ NotoSansGujarati-Regular.ttf \ NotoSansGujaratiUI-Bold.ttf \ NotoSansGujaratiUI-Regular.ttf \ + NotoSansGunjalaGondi-Regular.otf \ NotoSansGurmukhi-Bold.ttf \ NotoSansGurmukhi-Regular.ttf \ NotoSansGurmukhiUI-Bold.ttf \ NotoSansGurmukhiUI-Regular.ttf \ + NotoSansHanifiRohingya-Regular.otf \ NotoSansHanunoo-Regular.ttf \ NotoSansHatran-Regular.otf \ NotoSansHebrew-Bold.ttf \ @@ -84,7 +84,7 @@ PRODUCT_PACKAGES := \ NotoSansImperialAramaic-Regular.ttf \ NotoSansInscriptionalPahlavi-Regular.ttf \ NotoSansInscriptionalParthian-Regular.ttf \ - NotoSansJavanese-Regular.ttf \ + NotoSansJavanese-Regular.otf \ NotoSansKaithi-Regular.ttf \ NotoSansKannada-Bold.ttf \ NotoSansKannada-Regular.ttf \ @@ -95,6 +95,7 @@ PRODUCT_PACKAGES := \ NotoSansKhmer-VF.ttf \ NotoSansKhmerUI-Bold.ttf \ NotoSansKhmerUI-Regular.ttf \ + NotoSansKhojki-Regular.otf \ NotoSansLao-Bold.ttf \ NotoSansLao-Regular.ttf \ NotoSansLaoUI-Bold.ttf \ @@ -115,6 +116,7 @@ PRODUCT_PACKAGES := \ NotoSansMandaic-Regular.ttf \ NotoSansManichaean-Regular.otf \ NotoSansMarchen-Regular.otf \ + NotoSansMasaramGondi-Regular.otf \ NotoSansMeeteiMayek-Regular.ttf \ NotoSansMeroitic-Regular.otf \ NotoSansMiao-Regular.otf \ @@ -193,9 +195,11 @@ PRODUCT_PACKAGES := \ NotoSansThaiUI-Regular.ttf \ NotoSansTibetan-Bold.ttf \ NotoSansTibetan-Regular.ttf \ - NotoSansTifinagh-Regular.ttf \ + NotoSansTifinagh-Regular.otf \ NotoSansUgaritic-Regular.ttf \ NotoSansVai-Regular.ttf \ + NotoSansWancho-Regular.otf \ + NotoSansWarangCiti-Regular.otf \ NotoSansYi-Regular.ttf \ NotoSerif-Bold.ttf \ NotoSerif-BoldItalic.ttf \ @@ -210,8 +214,7 @@ PRODUCT_PACKAGES := \ NotoSerifDevanagari-Regular.ttf \ NotoSerifEthiopic-Bold.otf \ NotoSerifEthiopic-Regular.otf \ - NotoSerifGeorgian-Bold.otf \ - NotoSerifGeorgian-Regular.otf \ + NotoSerifGeorgian-VF.ttf \ NotoSerifGujarati-Bold.ttf \ NotoSerifGujarati-Regular.ttf \ NotoSerifGurmukhi-Bold.otf \ diff --git a/other/Android.bp b/other/Android.bp index d439501..7c2cd2b 100644 --- a/other/Android.bp +++ b/other/Android.bp @@ -33,8 +33,8 @@ prebuilt_font { } prebuilt_font { - name: "NotoSansAdlam-Regular.ttf", - src: "NotoSansAdlam-Regular.ttf", + name: "NotoSansAdlam-VF.ttf", + src: "NotoSansAdlam-VF.ttf", } prebuilt_font { @@ -268,8 +268,8 @@ prebuilt_font { } prebuilt_font { - name: "NotoSansJavanese-Regular.ttf", - src: "NotoSansJavanese-Regular.ttf", + name: "NotoSansJavanese-Regular.otf", + src: "NotoSansJavanese-Regular.otf", } prebuilt_font { @@ -777,11 +777,6 @@ prebuilt_font { src: "NotoSansTibetan-Regular.ttf", } -prebuilt_font { - name: "NotoSansTifinagh-Regular.ttf", - src: "NotoSansTifinagh-Regular.ttf", -} - prebuilt_font { name: "NotoSansUgaritic-Regular.ttf", src: "NotoSansUgaritic-Regular.ttf", @@ -863,18 +858,8 @@ prebuilt_font { } prebuilt_font { - name: "NotoSansGeorgian-Regular.otf", - src: "NotoSansGeorgian-Regular.otf", -} - -prebuilt_font { - name: "NotoSansGeorgian-Bold.otf", - src: "NotoSansGeorgian-Bold.otf", -} - -prebuilt_font { - name: "NotoSansGeorgian-Medium.otf", - src: "NotoSansGeorgian-Medium.otf", + name: "NotoSansGeorgian-VF.ttf", + src: "NotoSansGeorgian-VF.ttf", } prebuilt_font { @@ -922,6 +907,41 @@ prebuilt_font { src: "NotoSerifArmenian-Bold.otf", } +prebuilt_font { + name: "NotoSansGunjalaGondi-Regular.otf", + src: "NotoSansGunjalaGondi-Regular.otf", +} + +prebuilt_font { + name: "NotoSansHanifiRohingya-Regular.otf", + src: "NotoSansHanifiRohingya-Regular.otf", +} + +prebuilt_font { + name: "NotoSansKhojki-Regular.otf", + src: "NotoSansKhojki-Regular.otf", +} + +prebuilt_font { + name: "NotoSansMasaramGondi-Regular.otf", + src: "NotoSansMasaramGondi-Regular.otf", +} + +prebuilt_font { + name: "NotoSansTifinagh-Regular.otf", + src: "NotoSansTifinagh-Regular.otf", +} + +prebuilt_font { + name: "NotoSansWancho-Regular.otf", + src: "NotoSansWancho-Regular.otf", +} + +prebuilt_font { + name: "NotoSansWarangCiti-Regular.otf", + src: "NotoSansWarangCiti-Regular.otf", +} + prebuilt_font { name: "NotoSerifArmenian-Regular.otf", src: "NotoSerifArmenian-Regular.otf", @@ -958,13 +978,8 @@ prebuilt_font { } prebuilt_font { - name: "NotoSerifGeorgian-Bold.otf", - src: "NotoSerifGeorgian-Bold.otf", -} - -prebuilt_font { - name: "NotoSerifGeorgian-Regular.otf", - src: "NotoSerifGeorgian-Regular.otf", + name: "NotoSerifGeorgian-VF.ttf", + src: "NotoSerifGeorgian-VF.ttf", } prebuilt_font { diff --git a/other/NotoSansAdlam-Regular.ttf b/other/NotoSansAdlam-Regular.ttf deleted file mode 100644 index 20ea4ba..0000000 Binary files a/other/NotoSansAdlam-Regular.ttf and /dev/null differ diff --git a/other/NotoSansAdlam-VF.ttf b/other/NotoSansAdlam-VF.ttf new file mode 100644 index 0000000..a1c9159 Binary files /dev/null and b/other/NotoSansAdlam-VF.ttf differ diff --git a/other/NotoSansGeorgian-Bold.otf b/other/NotoSansGeorgian-Bold.otf deleted file mode 100644 index 086bd40..0000000 Binary files a/other/NotoSansGeorgian-Bold.otf and /dev/null differ diff --git a/other/NotoSansGeorgian-Medium.otf b/other/NotoSansGeorgian-Medium.otf deleted file mode 100644 index 15e5eb6..0000000 Binary files a/other/NotoSansGeorgian-Medium.otf and /dev/null differ diff --git a/other/NotoSansGeorgian-Regular.otf b/other/NotoSansGeorgian-Regular.otf deleted file mode 100644 index e59f368..0000000 Binary files a/other/NotoSansGeorgian-Regular.otf and /dev/null differ diff --git a/other/NotoSansGeorgian-VF.ttf b/other/NotoSansGeorgian-VF.ttf new file mode 100644 index 0000000..25df7f1 Binary files /dev/null and b/other/NotoSansGeorgian-VF.ttf differ diff --git a/other/NotoSansGunjalaGondi-Regular.otf b/other/NotoSansGunjalaGondi-Regular.otf new file mode 100644 index 0000000..4cc0fa3 Binary files /dev/null and b/other/NotoSansGunjalaGondi-Regular.otf differ diff --git a/other/NotoSansHanifiRohingya-Regular.otf b/other/NotoSansHanifiRohingya-Regular.otf new file mode 100644 index 0000000..f3dc231 Binary files /dev/null and b/other/NotoSansHanifiRohingya-Regular.otf differ diff --git a/other/NotoSansJavanese-Regular.otf b/other/NotoSansJavanese-Regular.otf new file mode 100644 index 0000000..e1aa665 Binary files /dev/null and b/other/NotoSansJavanese-Regular.otf differ diff --git a/other/NotoSansJavanese-Regular.ttf b/other/NotoSansJavanese-Regular.ttf deleted file mode 100644 index 2a855ed..0000000 Binary files a/other/NotoSansJavanese-Regular.ttf and /dev/null differ diff --git a/other/NotoSansKhojki-Regular.otf b/other/NotoSansKhojki-Regular.otf new file mode 100644 index 0000000..99146ac Binary files /dev/null and b/other/NotoSansKhojki-Regular.otf differ diff --git a/other/NotoSansMasaramGondi-Regular.otf b/other/NotoSansMasaramGondi-Regular.otf new file mode 100644 index 0000000..8833d01 Binary files /dev/null and b/other/NotoSansMasaramGondi-Regular.otf differ diff --git a/other/NotoSansTifinagh-Regular.otf b/other/NotoSansTifinagh-Regular.otf new file mode 100644 index 0000000..c8b87c8 Binary files /dev/null and b/other/NotoSansTifinagh-Regular.otf differ diff --git a/other/NotoSansTifinagh-Regular.ttf b/other/NotoSansTifinagh-Regular.ttf deleted file mode 100644 index 252a0dc..0000000 Binary files a/other/NotoSansTifinagh-Regular.ttf and /dev/null differ diff --git a/other/NotoSansWancho-Regular.otf b/other/NotoSansWancho-Regular.otf new file mode 100644 index 0000000..af941de Binary files /dev/null and b/other/NotoSansWancho-Regular.otf differ diff --git a/other/NotoSansWarangCiti-Regular.otf b/other/NotoSansWarangCiti-Regular.otf new file mode 100644 index 0000000..5da59fe Binary files /dev/null and b/other/NotoSansWarangCiti-Regular.otf differ diff --git a/other/NotoSerifGeorgian-Bold.otf b/other/NotoSerifGeorgian-Bold.otf deleted file mode 100644 index 1c2c01f..0000000 Binary files a/other/NotoSerifGeorgian-Bold.otf and /dev/null differ diff --git a/other/NotoSerifGeorgian-Regular.otf b/other/NotoSerifGeorgian-Regular.otf deleted file mode 100644 index f0186e6..0000000 Binary files a/other/NotoSerifGeorgian-Regular.otf and /dev/null differ diff --git a/other/NotoSerifGeorgian-VF.ttf b/other/NotoSerifGeorgian-VF.ttf new file mode 100644 index 0000000..29b0eb8 Binary files /dev/null and b/other/NotoSerifGeorgian-VF.ttf differ -- cgit v1.2.3 From 2c76cbb16fa27a7b95a2072df19e195e911b9a04 Mon Sep 17 00:00:00 2001 From: Rod S Date: Sun, 15 Mar 2020 23:33:38 -0700 Subject: Update Emoji font for Unicode 13.0 Test: m fontchain_lint Change-Id: I7277189dbb35f8bb59e62a686419e524632002b4 --- emoji/NotoColorEmoji.ttf | Bin 10083628 -> 10061988 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/emoji/NotoColorEmoji.ttf b/emoji/NotoColorEmoji.ttf index caf75a0..7973d94 100644 Binary files a/emoji/NotoColorEmoji.ttf and b/emoji/NotoColorEmoji.ttf differ -- cgit v1.2.3 From c228a9f61188896e9ce11e369d0e747062fa4c1b Mon Sep 17 00:00:00 2001 From: Rod S Date: Wed, 18 Mar 2020 19:27:51 -0700 Subject: Update NotoColorEmoji.ttf with latest tweaks from design. Test: m fontchain_lint Change-Id: I1294e043cb019eb3243589e841db3b0ce660e56f --- emoji/NotoColorEmoji.ttf | Bin 10061988 -> 10061496 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/emoji/NotoColorEmoji.ttf b/emoji/NotoColorEmoji.ttf index 7973d94..1a9fada 100644 Binary files a/emoji/NotoColorEmoji.ttf and b/emoji/NotoColorEmoji.ttf differ -- cgit v1.2.3 From 046bd4f28ee5b904a5451eacc975a0df3234b711 Mon Sep 17 00:00:00 2001 From: Rod S Date: Wed, 18 Mar 2020 19:27:51 -0700 Subject: Update NotoColorEmoji.ttf with latest tweaks from design. Test: m fontchain_lint Bug: 151964652 Change-Id: I1294e043cb019eb3243589e841db3b0ce660e56f (cherry picked from commit c228a9f61188896e9ce11e369d0e747062fa4c1b) --- emoji/NotoColorEmoji.ttf | Bin 10083628 -> 10061496 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/emoji/NotoColorEmoji.ttf b/emoji/NotoColorEmoji.ttf index caf75a0..1a9fada 100644 Binary files a/emoji/NotoColorEmoji.ttf and b/emoji/NotoColorEmoji.ttf differ -- cgit v1.2.3 From 2fe3685e9f18fc1c5bfcb0259e5a2a25e89eab85 Mon Sep 17 00:00:00 2001 From: Seigo Nonaka Date: Fri, 30 Apr 2021 18:28:54 -0700 Subject: Update NotoColorEmoji.ttf Bug: 186700258 Test: ./gradlew :e2:e2-bundled:cAT :emoji:cAT Change-Id: I016e2072fa71225600e0562d71ead664314696ce --- emoji-compat/font/NotoColorEmojiCompat.ttf | Bin 10589920 -> 10254400 bytes emoji/NotoColorEmoji.ttf | Bin 10061496 -> 10082864 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/emoji-compat/font/NotoColorEmojiCompat.ttf b/emoji-compat/font/NotoColorEmojiCompat.ttf index 0b2e8d0..2325304 100644 Binary files a/emoji-compat/font/NotoColorEmojiCompat.ttf and b/emoji-compat/font/NotoColorEmojiCompat.ttf differ diff --git a/emoji/NotoColorEmoji.ttf b/emoji/NotoColorEmoji.ttf index 1a9fada..98fadf4 100644 Binary files a/emoji/NotoColorEmoji.ttf and b/emoji/NotoColorEmoji.ttf differ -- cgit v1.2.3 From cc4062a3c2b72061f13686951d6f57b36ab1598d Mon Sep 17 00:00:00 2001 From: Seigo Nonaka Date: Wed, 1 Dec 2021 11:27:07 -0800 Subject: Update NotoColorEmojiCompat to 2.034 (Emoji 14) Bug: 208665210 Test: ./gradlew :emoji2:emoji2-bundled:cAT :emoji:emoji-bundled:cAT Change-Id: I9e4687f5cf87224faaa55ab9955e509087eaf71e --- emoji-compat/createfont.py | 93 ++++++++++++++++++++++--- emoji-compat/data/emoji_metadata.txt | 107 +++++++++++++++++++++++++++++ emoji-compat/font/NotoColorEmojiCompat.ttf | Bin 9805564 -> 10043088 bytes emoji-compat/supported-emojis/emojis.txt | 107 +++++++++++++++++++++++++++++ 4 files changed, 297 insertions(+), 10 deletions(-) diff --git a/emoji-compat/createfont.py b/emoji-compat/createfont.py index 39204f8..f694cf2 100755 --- a/emoji-compat/createfont.py +++ b/emoji-compat/createfont.py @@ -49,19 +49,22 @@ import hashlib import itertools import json import os +import re import shutil import subprocess import sys import tempfile from fontTools import ttLib +from fontTools.ttLib.tables import otTables +from nototools import font_data ########### UPDATE OR CHECK WHEN A NEW FONT IS BEING GENERATED ########### # Last Android SDK Version -SDK_VERSION = 30 +SDK_VERSION = 31 # metadata version that will be embedded into font. If there are updates to the font that would # cause data/emoji_metadata.txt to change, this integer number should be incremented. This number # defines in which EmojiCompat metadata version the emoji is added to the font. -METADATA_VERSION = 7 +METADATA_VERSION = 8 ####### main directories where output files are created ####### SCRIPT_DIR = os.path.abspath(os.path.dirname(__file__)) @@ -120,6 +123,12 @@ STD_VARIANTS_EMOJI_STYLE = 'EMOJI STYLE' DEFAULT_EMOJI_ID = 0xF0001 EMOJI_STYLE_VS = 0xFE0F +# The reference code point to be used for filling metrics of wartermark glyph +WATERMARK_REF_CODE_POINT = 0x1F600 +# The code point and glyph name used for watermark. +WATERMARK_NEW_CODE_POINT = 0x10FF00 +WATERMARK_NEW_GLYPH_ID = 'u10FF00' + def to_hex_str(value): """Converts given int value to hex without the 0x prefix""" return format(value, 'X') @@ -141,6 +150,12 @@ def prepend_header_to_file(file_path, header_path): original_file.seek(0) original_file.write(copyright_file.read() + "\n" + original_content) +def is_ri(codepoint): + return 0x1F1E6 <= codepoint and codepoint <= 0x1F1FF + +def is_flag_seq(codepoints): + return all(is_ri(x) for x in codepoints) + def update_flatbuffer_java_files(flatbuffer_java_dir, header_dir, target_dir): """Prepends headers to flatbuffer java files and copies to the final destination""" @@ -338,7 +353,7 @@ def read_emoji_intervals(emoji_data_map, file_path, emoji_style_exceptions): emoji_data_map[key] = emoji_data -def read_emoji_sequences(emoji_data_map, file_path, optional=False): +def read_emoji_sequences(emoji_data_map, file_path, optional=False, filter=None): """Reads the content of the file which contains emoji sequences. Creates EmojiData for each line and puts into emoji_data_map.""" lines = read_emoji_lines(file_path, optional) @@ -351,22 +366,29 @@ def read_emoji_sequences(emoji_data_map, file_path, optional=False): continue codepoints = [hex_str_to_int(x) for x in line.split(';')[0].strip().split(' ')] codepoints = [x for x in codepoints if x != EMOJI_STYLE_VS] + if filter: + if filter(codepoints): + continue key = codepoint_to_string(codepoints) if not key in emoji_data_map: emoji_data = _EmojiData(codepoints, False) emoji_data_map[key] = emoji_data -def load_emoji_data_map(unicode_path): +def load_emoji_data_map(unicode_path, without_flags): """Reads the emoji data files, constructs a map of space separated codepoints to EmojiData. :return: map of space separated codepoints to EmojiData """ + if without_flags: + filter = lambda x: is_flag_seq(x) + else: + filter = None emoji_data_map = {} emoji_style_exceptions = get_emoji_style_exceptions(unicode_path) read_emoji_intervals(emoji_data_map, os.path.join(unicode_path, EMOJI_DATA_FILE), emoji_style_exceptions) read_emoji_sequences(emoji_data_map, os.path.join(unicode_path, EMOJI_ZWJ_FILE)) - read_emoji_sequences(emoji_data_map, os.path.join(unicode_path, EMOJI_SEQ_FILE)) + read_emoji_sequences(emoji_data_map, os.path.join(unicode_path, EMOJI_SEQ_FILE), filter=filter) # Add the optional ANDROID_EMOJI_ZWJ_SEQ_FILE if it exists. read_emoji_sequences(emoji_data_map, os.path.join(unicode_path, ANDROID_EMOJI_ZWJ_SEQ_FILE), @@ -472,11 +494,12 @@ def create_sha_from_source_files(font_paths): class EmojiFontCreator(object): """Creates the EmojiCompat font""" - def __init__(self, font_path, unicode_path): + def __init__(self, font_path, unicode_path, without_flags): validate_input_files(font_path, unicode_path, FLATBUFFER_MODULE_DIR) self.font_path = font_path self.unicode_path = unicode_path + self.without_flags = without_flags self.emoji_data_map = {} self.remapped_codepoints = {} self.glyph_to_image_metrics_map = {} @@ -594,6 +617,8 @@ class EmojiFontCreator(object): total_emoji_count = 0 for emoji_data in emoji_data_list: + if self.without_flags and is_flag_seq(emoji_data.codepoints): + continue # Do not add flags emoji data if this is for subset font. element = emoji_data.create_json_element() output_json['list'].append(element) total_emoji_count = total_emoji_count + 1 @@ -614,6 +639,46 @@ class EmojiFontCreator(object): for emoji_data in emoji_data_list: csvwriter.writerow(emoji_data.create_txt_row()) + def add_watermark(self, ttf): + cmap = ttf.getBestCmap() + gsub = ttf['GSUB'].table + + # Obtain Version string + m = re.search('^Version (\d*)\.(\d*)', font_data.font_version(ttf)) + if not m: + raise ValueError('The font does not have proper version string.') + major = m.group(1) + minor = m.group(2) + # Replace the dot with space since NotoColorEmoji does not have glyph for dot. + glyphs = [cmap[ord(x)] for x in '%s %s' % (major, minor)] + + # Update Glyph metrics + ttf.getGlyphOrder().append(WATERMARK_NEW_GLYPH_ID) + refGlyphId = cmap[WATERMARK_REF_CODE_POINT] + ttf['hmtx'].metrics[WATERMARK_NEW_GLYPH_ID] = ttf['hmtx'].metrics[refGlyphId] + ttf['vmtx'].metrics[WATERMARK_NEW_GLYPH_ID] = ttf['vmtx'].metrics[refGlyphId] + + # Add new Glyph to cmap + font_data.add_to_cmap(ttf, { WATERMARK_NEW_CODE_POINT : WATERMARK_NEW_GLYPH_ID }) + + # Add lookup table for the version string. + lookups = gsub.LookupList.Lookup + new_lookup = otTables.Lookup() + new_lookup.LookupType = 2 # Multiple Substitution Subtable. + new_lookup.LookupFlag = 0 + new_subtable = otTables.MultipleSubst() + new_subtable.mapping = { WATERMARK_NEW_GLYPH_ID : tuple(glyphs) } + new_lookup.SubTable = [ new_subtable ] + new_lookup_index = len(lookups) + lookups.append(new_lookup) + + # Add feature + feature = next(x for x in gsub.FeatureList.FeatureRecord if x.FeatureTag == 'ccmp') + if not feature: + raise ValueError("Font doesn't contain ccmp feature.") + + feature.Feature.LookupListIndex.append(new_lookup_index) + def create_font(self): """Creates the EmojiCompat font. :param font_path: path to Android NotoColorEmoji font @@ -623,7 +688,7 @@ class EmojiFontCreator(object): tmp_dir = tempfile.mkdtemp() # create emoji codepoints to EmojiData map - self.emoji_data_map = load_emoji_data_map(self.unicode_path) + self.emoji_data_map = load_emoji_data_map(self.unicode_path, self.without_flags) # read previous metadata file to update id, sdkAdded and compatAdded. emoji id that is # returned is either default or 1 greater than the largest id in previous data @@ -671,6 +736,9 @@ class EmojiFontCreator(object): # inject metadata binary into font inject_meta_into_font(ttf, flatbuffer_bin_file) + # add wartermark glyph for manual verification. + self.add_watermark(ttf) + # update CBDT and CBLC versions since older android versions cannot read > 2.0 ttf['CBDT'].version = 2.0 ttf['CBLC'].version = 2.0 @@ -698,14 +766,19 @@ def print_usage(): def parse_args(argv): # parse manually to avoid any extra dependencies + if len(argv) == 4: + without_flags = argv[3] == '--without-flags' + else: + without_flags = False + if len(argv) < 3: print_usage() sys.exit(1) - return (sys.argv[1], sys.argv[2]) + return (sys.argv[1], sys.argv[2], without_flags) def main(): - font_file, unicode_dir = parse_args(sys.argv) - EmojiFontCreator(font_file, unicode_dir).create_font() + font_file, unicode_dir, without_flags = parse_args(sys.argv) + EmojiFontCreator(font_file, unicode_dir, without_flags).create_font() if __name__ == '__main__': diff --git a/emoji-compat/data/emoji_metadata.txt b/emoji-compat/data/emoji_metadata.txt index 6bee6fa..d57d34e 100644 --- a/emoji-compat/data/emoji_metadata.txt +++ b/emoji-compat/data/emoji_metadata.txt @@ -3578,3 +3578,110 @@ F0E2C 30 7 1F9D4 1F3FF 200D 2640 F0E2D 30 7 1F9D4 1F3FF 200D 2642 F0E2E 30 7 1F9D4 200D 2640 F0E2F 30 7 1F9D4 200D 2642 +F0E30 31 8 1F6DD +F0E31 31 8 1F6DE +F0E32 31 8 1F6DF +F0E33 31 8 1F7F0 +F0E34 31 8 1F979 +F0E35 31 8 1F9CC +F0E36 31 8 1FA7B +F0E37 31 8 1FA7C +F0E38 31 8 1FAA9 +F0E39 31 8 1FAAA +F0E3A 31 8 1FAAB +F0E3B 31 8 1FAAC +F0E3C 31 8 1FAB7 +F0E3D 31 8 1FAB8 +F0E3E 31 8 1FAB9 +F0E3F 31 8 1FABA +F0E40 31 8 1FAC3 +F0E41 31 8 1FAC4 +F0E42 31 8 1FAC5 +F0E43 31 8 1FAD7 +F0E44 31 8 1FAD8 +F0E45 31 8 1FAD9 +F0E46 31 8 1FAE0 +F0E47 31 8 1FAE1 +F0E48 31 8 1FAE2 +F0E49 31 8 1FAE3 +F0E4A 31 8 1FAE4 +F0E4B 31 8 1FAE5 +F0E4C 31 8 1FAE6 +F0E4D 31 8 1FAE7 +F0E4E 31 8 1FAF0 +F0E4F 31 8 1FAF1 +F0E50 31 8 1FAF2 +F0E51 31 8 1FAF3 +F0E52 31 8 1FAF4 +F0E53 31 8 1FAF5 +F0E54 31 8 1FAF6 +F0E55 31 8 1FAC3 1F3FB +F0E56 31 8 1FAC3 1F3FC +F0E57 31 8 1FAC3 1F3FD +F0E58 31 8 1FAC3 1F3FE +F0E59 31 8 1FAC3 1F3FF +F0E5A 31 8 1FAC4 1F3FB +F0E5B 31 8 1FAC4 1F3FC +F0E5C 31 8 1FAC4 1F3FD +F0E5D 31 8 1FAC4 1F3FE +F0E5E 31 8 1FAC4 1F3FF +F0E5F 31 8 1FAC5 1F3FB +F0E60 31 8 1FAC5 1F3FC +F0E61 31 8 1FAC5 1F3FD +F0E62 31 8 1FAC5 1F3FE +F0E63 31 8 1FAC5 1F3FF +F0E64 31 8 1FAF0 1F3FB +F0E65 31 8 1FAF0 1F3FC +F0E66 31 8 1FAF0 1F3FD +F0E67 31 8 1FAF0 1F3FE +F0E68 31 8 1FAF0 1F3FF +F0E69 31 8 1FAF1 1F3FB 200D 1FAF2 1F3FC +F0E6A 31 8 1FAF1 1F3FB 200D 1FAF2 1F3FD +F0E6B 31 8 1FAF1 1F3FB 200D 1FAF2 1F3FE +F0E6C 31 8 1FAF1 1F3FB 200D 1FAF2 1F3FF +F0E6D 31 8 1FAF1 1F3FC 200D 1FAF2 1F3FB +F0E6E 31 8 1FAF1 1F3FC 200D 1FAF2 1F3FD +F0E6F 31 8 1FAF1 1F3FC 200D 1FAF2 1F3FE +F0E70 31 8 1FAF1 1F3FC 200D 1FAF2 1F3FF +F0E71 31 8 1FAF1 1F3FD 200D 1FAF2 1F3FB +F0E72 31 8 1FAF1 1F3FD 200D 1FAF2 1F3FC +F0E73 31 8 1FAF1 1F3FD 200D 1FAF2 1F3FE +F0E74 31 8 1FAF1 1F3FD 200D 1FAF2 1F3FF +F0E75 31 8 1FAF1 1F3FE 200D 1FAF2 1F3FB +F0E76 31 8 1FAF1 1F3FE 200D 1FAF2 1F3FC +F0E77 31 8 1FAF1 1F3FE 200D 1FAF2 1F3FD +F0E78 31 8 1FAF1 1F3FE 200D 1FAF2 1F3FF +F0E79 31 8 1FAF1 1F3FF 200D 1FAF2 1F3FB +F0E7A 31 8 1FAF1 1F3FF 200D 1FAF2 1F3FC +F0E7B 31 8 1FAF1 1F3FF 200D 1FAF2 1F3FD +F0E7C 31 8 1FAF1 1F3FF 200D 1FAF2 1F3FE +F0E7D 31 8 1FAF1 1F3FB +F0E7E 31 8 1FAF1 1F3FC +F0E7F 31 8 1FAF1 1F3FD +F0E80 31 8 1FAF1 1F3FE +F0E81 31 8 1FAF1 1F3FF +F0E82 31 8 1FAF2 1F3FB +F0E83 31 8 1FAF2 1F3FC +F0E84 31 8 1FAF2 1F3FD +F0E85 31 8 1FAF2 1F3FE +F0E86 31 8 1FAF2 1F3FF +F0E87 31 8 1FAF3 1F3FB +F0E88 31 8 1FAF3 1F3FC +F0E89 31 8 1FAF3 1F3FD +F0E8A 31 8 1FAF3 1F3FE +F0E8B 31 8 1FAF3 1F3FF +F0E8C 31 8 1FAF4 1F3FB +F0E8D 31 8 1FAF4 1F3FC +F0E8E 31 8 1FAF4 1F3FD +F0E8F 31 8 1FAF4 1F3FE +F0E90 31 8 1FAF4 1F3FF +F0E91 31 8 1FAF5 1F3FB +F0E92 31 8 1FAF5 1F3FC +F0E93 31 8 1FAF5 1F3FD +F0E94 31 8 1FAF5 1F3FE +F0E95 31 8 1FAF5 1F3FF +F0E96 31 8 1FAF6 1F3FB +F0E97 31 8 1FAF6 1F3FC +F0E98 31 8 1FAF6 1F3FD +F0E99 31 8 1FAF6 1F3FE +F0E9A 31 8 1FAF6 1F3FF diff --git a/emoji-compat/font/NotoColorEmojiCompat.ttf b/emoji-compat/font/NotoColorEmojiCompat.ttf index 9cc330f..7334ae8 100644 Binary files a/emoji-compat/font/NotoColorEmojiCompat.ttf and b/emoji-compat/font/NotoColorEmojiCompat.ttf differ diff --git a/emoji-compat/supported-emojis/emojis.txt b/emoji-compat/supported-emojis/emojis.txt index a4818c0..a3ac299 100644 --- a/emoji-compat/supported-emojis/emojis.txt +++ b/emoji-compat/supported-emojis/emojis.txt @@ -2388,6 +2388,9 @@ 1F6D5 1F6D6 1F6D7 +1F6DD +1F6DE +1F6DF 1F6E0 FE0F 1F6E1 FE0F 1F6E2 FE0F @@ -2420,6 +2423,7 @@ 1F7E9 1F7EA 1F7EB +1F7F0 1F90C 1F90C 1F3FB 1F90C 1F3FC @@ -2748,6 +2752,7 @@ 1F977 1F3FE 1F977 1F3FF 1F978 +1F979 1F97A 1F97B 1F97C @@ -2879,6 +2884,7 @@ 1F9C9 1F9CA 1F9CB +1F9CC 1F9CD 1F9CD 1F3FB 1F9CD 1F3FB 200D 2640 FE0F @@ -3382,6 +3388,8 @@ 1FA78 1FA79 1FA7A +1FA7B +1FA7C 1FA80 1FA81 1FA82 @@ -3414,6 +3422,10 @@ 1FAA6 1FAA7 1FAA8 +1FAA9 +1FAAA +1FAAB +1FAAC 1FAB0 1FAB1 1FAB2 @@ -3421,9 +3433,31 @@ 1FAB4 1FAB5 1FAB6 +1FAB7 +1FAB8 +1FAB9 +1FABA 1FAC0 1FAC1 1FAC2 +1FAC3 +1FAC3 1F3FB +1FAC3 1F3FC +1FAC3 1F3FD +1FAC3 1F3FE +1FAC3 1F3FF +1FAC4 +1FAC4 1F3FB +1FAC4 1F3FC +1FAC4 1F3FD +1FAC4 1F3FE +1FAC4 1F3FF +1FAC5 +1FAC5 1F3FB +1FAC5 1F3FC +1FAC5 1F3FD +1FAC5 1F3FE +1FAC5 1F3FF 1FAD0 1FAD1 1FAD2 @@ -3431,6 +3465,79 @@ 1FAD4 1FAD5 1FAD6 +1FAD7 +1FAD8 +1FAD9 +1FAE0 +1FAE1 +1FAE2 +1FAE3 +1FAE4 +1FAE5 +1FAE6 +1FAE7 +1FAF0 +1FAF0 1F3FB +1FAF0 1F3FC +1FAF0 1F3FD +1FAF0 1F3FE +1FAF0 1F3FF +1FAF1 +1FAF1 1F3FB +1FAF1 1F3FB 200D 1FAF2 1F3FC +1FAF1 1F3FB 200D 1FAF2 1F3FD +1FAF1 1F3FB 200D 1FAF2 1F3FE +1FAF1 1F3FB 200D 1FAF2 1F3FF +1FAF1 1F3FC +1FAF1 1F3FC 200D 1FAF2 1F3FB +1FAF1 1F3FC 200D 1FAF2 1F3FD +1FAF1 1F3FC 200D 1FAF2 1F3FE +1FAF1 1F3FC 200D 1FAF2 1F3FF +1FAF1 1F3FD +1FAF1 1F3FD 200D 1FAF2 1F3FB +1FAF1 1F3FD 200D 1FAF2 1F3FC +1FAF1 1F3FD 200D 1FAF2 1F3FE +1FAF1 1F3FD 200D 1FAF2 1F3FF +1FAF1 1F3FE +1FAF1 1F3FE 200D 1FAF2 1F3FB +1FAF1 1F3FE 200D 1FAF2 1F3FC +1FAF1 1F3FE 200D 1FAF2 1F3FD +1FAF1 1F3FE 200D 1FAF2 1F3FF +1FAF1 1F3FF +1FAF1 1F3FF 200D 1FAF2 1F3FB +1FAF1 1F3FF 200D 1FAF2 1F3FC +1FAF1 1F3FF 200D 1FAF2 1F3FD +1FAF1 1F3FF 200D 1FAF2 1F3FE +1FAF2 +1FAF2 1F3FB +1FAF2 1F3FC +1FAF2 1F3FD +1FAF2 1F3FE +1FAF2 1F3FF +1FAF3 +1FAF3 1F3FB +1FAF3 1F3FC +1FAF3 1F3FD +1FAF3 1F3FE +1FAF3 1F3FF +1FAF4 +1FAF4 1F3FB +1FAF4 1F3FC +1FAF4 1F3FD +1FAF4 1F3FE +1FAF4 1F3FF +1FAF5 +1FAF5 1F3FB +1FAF5 1F3FC +1FAF5 1F3FD +1FAF5 1F3FE +1FAF5 1F3FF +1FAF6 +1FAF6 1F3FB +1FAF6 1F3FC +1FAF6 1F3FD +1FAF6 1F3FE +1FAF6 1F3FF 203C FE0F 2049 FE0F 2122 FE0F -- cgit v1.2.3 From 8c4ea0d700b98ce6b6fa11313b2c100cb573743f Mon Sep 17 00:00:00 2001 From: Aurimas Liutikas Date: Mon, 1 Aug 2022 10:59:40 -0700 Subject: Target Java 8 for emoji-compat-flatbuffers JDK 17 no longer supports targeting Java 7, move to 8 to match the rest of the androidx libraries. Test: ./gradlew jar (using jdk17) no warnings Change-Id: I502e697d473295d8da288a1245f803de917a143e --- emoji-compat-flatbuffers/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/emoji-compat-flatbuffers/build.gradle b/emoji-compat-flatbuffers/build.gradle index 20d8dfb..3d9d8cb 100644 --- a/emoji-compat-flatbuffers/build.gradle +++ b/emoji-compat-flatbuffers/build.gradle @@ -25,8 +25,8 @@ sourceSets { } compileJava { - sourceCompatibility = JavaVersion.VERSION_1_7 - targetCompatibility = JavaVersion.VERSION_1_7 + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 } dependencies { -- cgit v1.2.3