Skip QD1A.190821.011 in stage-aosp-master

Bug: 141248619
Change-Id: I01380c5ffa742d99f9119048fc3b1d58087b9009
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-compat/createfont.py b/emoji-compat/createfont.py
index da1910c..7b42c5e 100755
--- a/emoji-compat/createfont.py
+++ b/emoji-compat/createfont.py
@@ -58,11 +58,11 @@
 
 ########### UPDATE OR CHECK WHEN A NEW FONT IS BEING GENERATED ###########
 # Last Android SDK Version
-SDK_VERSION = 28
+SDK_VERSION = 29
 # 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 = 3
+METADATA_VERSION = 4
 
 ####### main directories where output files are created #######
 SCRIPT_DIR = os.path.abspath(os.path.dirname(__file__))
@@ -173,6 +173,11 @@
 
     emojis_set = set()
     for line in lines:
+        # In unicode 12.0, "emoji-sequences.txt" contains "Basic_Emoji" session. We ignore them
+        # here since we are already checking the emoji presentations with
+        # emoji-variation-sequences.txt.
+        if "BASIC_EMOJI" in line:
+            continue
         codepoints = [hex_str_to_int(x) for x in line.split(';')[0].strip().split(' ')]
         emojis_set.add(codepoint_to_string(codepoints).upper())
 
@@ -339,6 +344,11 @@
     lines = read_emoji_lines(file_path, optional)
     # 1F1E6 1F1E8 ; Name ; [...]
     for line in lines:
+        # In unicode 12.0, "emoji-sequences.txt" contains "Basic_Emoji" session. We ignore them
+        # here since we are already checking the emoji presentations with
+        # emoji-variation-sequences.txt.
+        if "BASIC_EMOJI" in line:
+            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]
         key = codepoint_to_string(codepoints)
diff --git a/emoji-compat/data/emoji_metadata.txt b/emoji-compat/data/emoji_metadata.txt
index 048957f..13b109d 100644
--- a/emoji-compat/data/emoji_metadata.txt
+++ b/emoji-compat/data/emoji_metadata.txt
@@ -2846,3 +2846,233 @@
 F0B51 28 3 1F9B6 1F3FD

 F0B52 28 3 1F9B6 1F3FE

 F0B53 28 3 1F9B6 1F3FF

+F0B54 29 4 1F6D5

+F0B55 29 4 1F6FA

+F0B56 29 4 1F7E0

+F0B57 29 4 1F7E1

+F0B58 29 4 1F7E2

+F0B59 29 4 1F7E3

+F0B5A 29 4 1F7E4

+F0B5B 29 4 1F7E5

+F0B5C 29 4 1F7E6

+F0B5D 29 4 1F7E7

+F0B5E 29 4 1F7E8

+F0B5F 29 4 1F7E9

+F0B60 29 4 1F7EA

+F0B61 29 4 1F7EB

+F0B62 29 4 1F90D

+F0B63 29 4 1F90E

+F0B64 29 4 1F90F

+F0B65 29 4 1F93F

+F0B66 29 4 1F971

+F0B67 29 4 1F97B

+F0B68 29 4 1F9A5

+F0B69 29 4 1F9A6

+F0B6A 29 4 1F9A7

+F0B6B 29 4 1F9A8

+F0B6C 29 4 1F9A9

+F0B6D 29 4 1F9AA

+F0B6E 29 4 1F9AE

+F0B6F 29 4 1F9AF

+F0B70 29 4 1F9BA

+F0B71 29 4 1F9BB

+F0B72 29 4 1F9BC

+F0B73 29 4 1F9BD

+F0B74 29 4 1F9BE

+F0B75 29 4 1F9BF

+F0B76 29 4 1F9C3

+F0B77 29 4 1F9C4

+F0B78 29 4 1F9C5

+F0B79 29 4 1F9C6

+F0B7A 29 4 1F9C7

+F0B7B 29 4 1F9C8

+F0B7C 29 4 1F9C9

+F0B7D 29 4 1F9CA

+F0B7E 29 4 1F9CD

+F0B7F 29 4 1F9CE

+F0B80 29 4 1F9CF

+F0B81 29 4 1FA70

+F0B82 29 4 1FA71

+F0B83 29 4 1FA72

+F0B84 29 4 1FA73

+F0B85 29 4 1FA78

+F0B86 29 4 1FA79

+F0B87 29 4 1FA7A

+F0B88 29 4 1FA80

+F0B89 29 4 1FA81

+F0B8A 29 4 1FA82

+F0B8B 29 4 1FA90

+F0B8C 29 4 1FA91

+F0B8D 29 4 1FA92

+F0B8E 29 4 1FA93

+F0B8F 29 4 1FA94

+F0B90 29 4 1FA95

+F0B91 29 4 1F46B 1F3FB

+F0B92 29 4 1F46B 1F3FC

+F0B93 29 4 1F46B 1F3FD

+F0B94 29 4 1F46B 1F3FE

+F0B95 29 4 1F46B 1F3FF

+F0B96 29 4 1F46C 1F3FB

+F0B97 29 4 1F46C 1F3FC

+F0B98 29 4 1F46C 1F3FD

+F0B99 29 4 1F46C 1F3FE

+F0B9A 29 4 1F46C 1F3FF

+F0B9B 29 4 1F46D 1F3FB

+F0B9C 29 4 1F46D 1F3FC

+F0B9D 29 4 1F46D 1F3FD

+F0B9E 29 4 1F46D 1F3FE

+F0B9F 29 4 1F46D 1F3FF

+F0BA0 29 4 1F469 1F3FB 200D 1F91D 200D 1F468 1F3FC

+F0BA1 29 4 1F469 1F3FB 200D 1F91D 200D 1F468 1F3FD

+F0BA2 29 4 1F469 1F3FB 200D 1F91D 200D 1F468 1F3FE

+F0BA3 29 4 1F469 1F3FB 200D 1F91D 200D 1F468 1F3FF

+F0BA4 29 4 1F469 1F3FC 200D 1F91D 200D 1F468 1F3FB

+F0BA5 29 4 1F469 1F3FC 200D 1F91D 200D 1F468 1F3FD

+F0BA6 29 4 1F469 1F3FC 200D 1F91D 200D 1F468 1F3FE

+F0BA7 29 4 1F469 1F3FC 200D 1F91D 200D 1F468 1F3FF

+F0BA8 29 4 1F469 1F3FC 200D 1F91D 200D 1F469 1F3FB

+F0BA9 29 4 1F469 1F3FD 200D 1F91D 200D 1F468 1F3FB

+F0BAA 29 4 1F469 1F3FD 200D 1F91D 200D 1F468 1F3FC

+F0BAB 29 4 1F469 1F3FD 200D 1F91D 200D 1F468 1F3FE

+F0BAC 29 4 1F469 1F3FD 200D 1F91D 200D 1F468 1F3FF

+F0BAD 29 4 1F469 1F3FD 200D 1F91D 200D 1F469 1F3FB

+F0BAE 29 4 1F469 1F3FD 200D 1F91D 200D 1F469 1F3FC

+F0BAF 29 4 1F469 1F3FE 200D 1F91D 200D 1F468 1F3FB

+F0BB0 29 4 1F469 1F3FE 200D 1F91D 200D 1F468 1F3FC

+F0BB1 29 4 1F469 1F3FE 200D 1F91D 200D 1F468 1F3FD

+F0BB2 29 4 1F469 1F3FE 200D 1F91D 200D 1F468 1F3FF

+F0BB3 29 4 1F469 1F3FE 200D 1F91D 200D 1F469 1F3FB

+F0BB4 29 4 1F469 1F3FE 200D 1F91D 200D 1F469 1F3FC

+F0BB5 29 4 1F469 1F3FE 200D 1F91D 200D 1F469 1F3FD

+F0BB6 29 4 1F469 1F3FF 200D 1F91D 200D 1F468 1F3FB

+F0BB7 29 4 1F469 1F3FF 200D 1F91D 200D 1F468 1F3FC

+F0BB8 29 4 1F469 1F3FF 200D 1F91D 200D 1F468 1F3FD

+F0BB9 29 4 1F469 1F3FF 200D 1F91D 200D 1F468 1F3FE

+F0BBA 29 4 1F469 1F3FF 200D 1F91D 200D 1F469 1F3FB

+F0BBB 29 4 1F469 1F3FF 200D 1F91D 200D 1F469 1F3FC

+F0BBC 29 4 1F469 1F3FF 200D 1F91D 200D 1F469 1F3FD

+F0BBD 29 4 1F469 1F3FF 200D 1F91D 200D 1F469 1F3FE

+F0BBE 29 4 1F469 1F3FB 200D 1F9AF

+F0BBF 29 4 1F469 1F3FB 200D 1F9BC

+F0BC0 29 4 1F469 1F3FB 200D 1F9BD

+F0BC1 29 4 1F469 1F3FC 200D 1F9AF

+F0BC2 29 4 1F469 1F3FC 200D 1F9BC

+F0BC3 29 4 1F469 1F3FC 200D 1F9BD

+F0BC4 29 4 1F469 1F3FD 200D 1F9AF

+F0BC5 29 4 1F469 1F3FD 200D 1F9BC

+F0BC6 29 4 1F469 1F3FD 200D 1F9BD

+F0BC7 29 4 1F469 1F3FE 200D 1F9AF

+F0BC8 29 4 1F469 1F3FE 200D 1F9BC

+F0BC9 29 4 1F469 1F3FE 200D 1F9BD

+F0BCA 29 4 1F469 1F3FF 200D 1F9AF

+F0BCB 29 4 1F469 1F3FF 200D 1F9BC

+F0BCC 29 4 1F469 1F3FF 200D 1F9BD

+F0BCD 29 4 1F469 200D 1F9AF

+F0BCE 29 4 1F469 200D 1F9BC

+F0BCF 29 4 1F469 200D 1F9BD

+F0BD0 29 4 1F468 1F3FC 200D 1F91D 200D 1F468 1F3FB

+F0BD1 29 4 1F468 1F3FD 200D 1F91D 200D 1F468 1F3FB

+F0BD2 29 4 1F468 1F3FD 200D 1F91D 200D 1F468 1F3FC

+F0BD3 29 4 1F468 1F3FE 200D 1F91D 200D 1F468 1F3FB

+F0BD4 29 4 1F468 1F3FE 200D 1F91D 200D 1F468 1F3FC

+F0BD5 29 4 1F468 1F3FE 200D 1F91D 200D 1F468 1F3FD

+F0BD6 29 4 1F468 1F3FF 200D 1F91D 200D 1F468 1F3FB

+F0BD7 29 4 1F468 1F3FF 200D 1F91D 200D 1F468 1F3FC

+F0BD8 29 4 1F468 1F3FF 200D 1F91D 200D 1F468 1F3FD

+F0BD9 29 4 1F468 1F3FF 200D 1F91D 200D 1F468 1F3FE

+F0BDA 29 4 1F468 1F3FB 200D 1F9AF

+F0BDB 29 4 1F468 1F3FB 200D 1F9BC

+F0BDC 29 4 1F468 1F3FB 200D 1F9BD

+F0BDD 29 4 1F468 1F3FC 200D 1F9AF

+F0BDE 29 4 1F468 1F3FC 200D 1F9BC

+F0BDF 29 4 1F468 1F3FC 200D 1F9BD

+F0BE0 29 4 1F468 1F3FD 200D 1F9AF

+F0BE1 29 4 1F468 1F3FD 200D 1F9BC

+F0BE2 29 4 1F468 1F3FD 200D 1F9BD

+F0BE3 29 4 1F468 1F3FE 200D 1F9AF

+F0BE4 29 4 1F468 1F3FE 200D 1F9BC

+F0BE5 29 4 1F468 1F3FE 200D 1F9BD

+F0BE6 29 4 1F468 1F3FF 200D 1F9AF

+F0BE7 29 4 1F468 1F3FF 200D 1F9BC

+F0BE8 29 4 1F468 1F3FF 200D 1F9BD

+F0BE9 29 4 1F468 200D 1F9AF

+F0BEA 29 4 1F468 200D 1F9BC

+F0BEB 29 4 1F468 200D 1F9BD

+F0BEC 29 4 1F415 200D 1F9BA

+F0BED 29 4 1F90F 1F3FB

+F0BEE 29 4 1F90F 1F3FC

+F0BEF 29 4 1F90F 1F3FD

+F0BF0 29 4 1F90F 1F3FE

+F0BF1 29 4 1F90F 1F3FF

+F0BF2 29 4 1F9D1 1F3FB 200D 1F91D 200D 1F9D1 1F3FB

+F0BF3 29 4 1F9D1 1F3FC 200D 1F91D 200D 1F9D1 1F3FB

+F0BF4 29 4 1F9D1 1F3FC 200D 1F91D 200D 1F9D1 1F3FC

+F0BF5 29 4 1F9D1 1F3FD 200D 1F91D 200D 1F9D1 1F3FB

+F0BF6 29 4 1F9D1 1F3FD 200D 1F91D 200D 1F9D1 1F3FC

+F0BF7 29 4 1F9D1 1F3FD 200D 1F91D 200D 1F9D1 1F3FD

+F0BF8 29 4 1F9D1 1F3FE 200D 1F91D 200D 1F9D1 1F3FB

+F0BF9 29 4 1F9D1 1F3FE 200D 1F91D 200D 1F9D1 1F3FC

+F0BFA 29 4 1F9D1 1F3FE 200D 1F91D 200D 1F9D1 1F3FD

+F0BFB 29 4 1F9D1 1F3FE 200D 1F91D 200D 1F9D1 1F3FE

+F0BFC 29 4 1F9D1 1F3FF 200D 1F91D 200D 1F9D1 1F3FB

+F0BFD 29 4 1F9D1 1F3FF 200D 1F91D 200D 1F9D1 1F3FC

+F0BFE 29 4 1F9D1 1F3FF 200D 1F91D 200D 1F9D1 1F3FD

+F0BFF 29 4 1F9D1 1F3FF 200D 1F91D 200D 1F9D1 1F3FE

+F0C00 29 4 1F9D1 1F3FF 200D 1F91D 200D 1F9D1 1F3FF

+F0C01 29 4 1F9D1 200D 1F91D 200D 1F9D1

+F0C02 29 4 1F9BB 1F3FB

+F0C03 29 4 1F9BB 1F3FC

+F0C04 29 4 1F9BB 1F3FD

+F0C05 29 4 1F9BB 1F3FE

+F0C06 29 4 1F9BB 1F3FF

+F0C07 29 4 1F9CF 1F3FB 200D 2640

+F0C08 29 4 1F9CF 1F3FB 200D 2642

+F0C09 29 4 1F9CF 1F3FC 200D 2640

+F0C0A 29 4 1F9CF 1F3FC 200D 2642

+F0C0B 29 4 1F9CF 1F3FD 200D 2640

+F0C0C 29 4 1F9CF 1F3FD 200D 2642

+F0C0D 29 4 1F9CF 1F3FE 200D 2640

+F0C0E 29 4 1F9CF 1F3FE 200D 2642

+F0C0F 29 4 1F9CF 1F3FF 200D 2640

+F0C10 29 4 1F9CF 1F3FF 200D 2642

+F0C11 29 4 1F9CF 200D 2640

+F0C12 29 4 1F9CF 200D 2642

+F0C13 29 4 1F9CF 1F3FB

+F0C14 29 4 1F9CF 1F3FC

+F0C15 29 4 1F9CF 1F3FD

+F0C16 29 4 1F9CF 1F3FE

+F0C17 29 4 1F9CF 1F3FF

+F0C18 29 4 1F9CD 1F3FB 200D 2640

+F0C19 29 4 1F9CD 1F3FB 200D 2642

+F0C1A 29 4 1F9CD 1F3FC 200D 2640

+F0C1B 29 4 1F9CD 1F3FC 200D 2642

+F0C1C 29 4 1F9CD 1F3FD 200D 2640

+F0C1D 29 4 1F9CD 1F3FD 200D 2642

+F0C1E 29 4 1F9CD 1F3FE 200D 2640

+F0C1F 29 4 1F9CD 1F3FE 200D 2642

+F0C20 29 4 1F9CD 1F3FF 200D 2640

+F0C21 29 4 1F9CD 1F3FF 200D 2642

+F0C22 29 4 1F9CD 200D 2640

+F0C23 29 4 1F9CD 200D 2642

+F0C24 29 4 1F9CD 1F3FB

+F0C25 29 4 1F9CD 1F3FC

+F0C26 29 4 1F9CD 1F3FD

+F0C27 29 4 1F9CD 1F3FE

+F0C28 29 4 1F9CD 1F3FF

+F0C29 29 4 1F9CE 1F3FB 200D 2640

+F0C2A 29 4 1F9CE 1F3FB 200D 2642

+F0C2B 29 4 1F9CE 1F3FC 200D 2640

+F0C2C 29 4 1F9CE 1F3FC 200D 2642

+F0C2D 29 4 1F9CE 1F3FD 200D 2640

+F0C2E 29 4 1F9CE 1F3FD 200D 2642

+F0C2F 29 4 1F9CE 1F3FE 200D 2640

+F0C30 29 4 1F9CE 1F3FE 200D 2642

+F0C31 29 4 1F9CE 1F3FF 200D 2640

+F0C32 29 4 1F9CE 1F3FF 200D 2642

+F0C33 29 4 1F9CE 200D 2640

+F0C34 29 4 1F9CE 200D 2642

+F0C35 29 4 1F9CE 1F3FB

+F0C36 29 4 1F9CE 1F3FC

+F0C37 29 4 1F9CE 1F3FD

+F0C38 29 4 1F9CE 1F3FE

+F0C39 29 4 1F9CE 1F3FF

diff --git a/emoji-compat/font/NotoColorEmojiCompat.ttf b/emoji-compat/font/NotoColorEmojiCompat.ttf
index b518b8b..4cfa68b 100644
--- a/emoji-compat/font/NotoColorEmojiCompat.ttf
+++ b/emoji-compat/font/NotoColorEmojiCompat.ttf
Binary files differ
diff --git a/emoji-compat/supported-emojis/emojis.txt b/emoji-compat/supported-emojis/emojis.txt
index 0e2ddc2..18c2667 100644
--- a/emoji-compat/supported-emojis/emojis.txt
+++ b/emoji-compat/supported-emojis/emojis.txt
@@ -708,6 +708,7 @@
 1F413
 1F414
 1F415
+1F415 200D 1F9BA
 1F415 FE0F
 1F416
 1F417
@@ -892,10 +893,13 @@
 1F468 1F3FB 200D 1F52C
 1F468 1F3FB 200D 1F680
 1F468 1F3FB 200D 1F692
+1F468 1F3FB 200D 1F9AF
 1F468 1F3FB 200D 1F9B0
 1F468 1F3FB 200D 1F9B1
 1F468 1F3FB 200D 1F9B2
 1F468 1F3FB 200D 1F9B3
+1F468 1F3FB 200D 1F9BC
+1F468 1F3FB 200D 1F9BD
 1F468 1F3FB 200D 2695 FE0F
 1F468 1F3FB 200D 2696 FE0F
 1F468 1F3FB 200D 2708 FE0F
@@ -913,10 +917,14 @@
 1F468 1F3FC 200D 1F52C
 1F468 1F3FC 200D 1F680
 1F468 1F3FC 200D 1F692
+1F468 1F3FC 200D 1F91D 200D 1F468 1F3FB
+1F468 1F3FC 200D 1F9AF
 1F468 1F3FC 200D 1F9B0
 1F468 1F3FC 200D 1F9B1
 1F468 1F3FC 200D 1F9B2
 1F468 1F3FC 200D 1F9B3
+1F468 1F3FC 200D 1F9BC
+1F468 1F3FC 200D 1F9BD
 1F468 1F3FC 200D 2695 FE0F
 1F468 1F3FC 200D 2696 FE0F
 1F468 1F3FC 200D 2708 FE0F
@@ -934,10 +942,15 @@
 1F468 1F3FD 200D 1F52C
 1F468 1F3FD 200D 1F680
 1F468 1F3FD 200D 1F692
+1F468 1F3FD 200D 1F91D 200D 1F468 1F3FB
+1F468 1F3FD 200D 1F91D 200D 1F468 1F3FC
+1F468 1F3FD 200D 1F9AF
 1F468 1F3FD 200D 1F9B0
 1F468 1F3FD 200D 1F9B1
 1F468 1F3FD 200D 1F9B2
 1F468 1F3FD 200D 1F9B3
+1F468 1F3FD 200D 1F9BC
+1F468 1F3FD 200D 1F9BD
 1F468 1F3FD 200D 2695 FE0F
 1F468 1F3FD 200D 2696 FE0F
 1F468 1F3FD 200D 2708 FE0F
@@ -955,10 +968,16 @@
 1F468 1F3FE 200D 1F52C
 1F468 1F3FE 200D 1F680
 1F468 1F3FE 200D 1F692
+1F468 1F3FE 200D 1F91D 200D 1F468 1F3FB
+1F468 1F3FE 200D 1F91D 200D 1F468 1F3FC
+1F468 1F3FE 200D 1F91D 200D 1F468 1F3FD
+1F468 1F3FE 200D 1F9AF
 1F468 1F3FE 200D 1F9B0
 1F468 1F3FE 200D 1F9B1
 1F468 1F3FE 200D 1F9B2
 1F468 1F3FE 200D 1F9B3
+1F468 1F3FE 200D 1F9BC
+1F468 1F3FE 200D 1F9BD
 1F468 1F3FE 200D 2695 FE0F
 1F468 1F3FE 200D 2696 FE0F
 1F468 1F3FE 200D 2708 FE0F
@@ -976,10 +995,17 @@
 1F468 1F3FF 200D 1F52C
 1F468 1F3FF 200D 1F680
 1F468 1F3FF 200D 1F692
+1F468 1F3FF 200D 1F91D 200D 1F468 1F3FB
+1F468 1F3FF 200D 1F91D 200D 1F468 1F3FC
+1F468 1F3FF 200D 1F91D 200D 1F468 1F3FD
+1F468 1F3FF 200D 1F91D 200D 1F468 1F3FE
+1F468 1F3FF 200D 1F9AF
 1F468 1F3FF 200D 1F9B0
 1F468 1F3FF 200D 1F9B1
 1F468 1F3FF 200D 1F9B2
 1F468 1F3FF 200D 1F9B3
+1F468 1F3FF 200D 1F9BC
+1F468 1F3FF 200D 1F9BD
 1F468 1F3FF 200D 2695 FE0F
 1F468 1F3FF 200D 2696 FE0F
 1F468 1F3FF 200D 2708 FE0F
@@ -1011,10 +1037,13 @@
 1F468 200D 1F52C
 1F468 200D 1F680
 1F468 200D 1F692
+1F468 200D 1F9AF
 1F468 200D 1F9B0
 1F468 200D 1F9B1
 1F468 200D 1F9B2
 1F468 200D 1F9B3
+1F468 200D 1F9BC
+1F468 200D 1F9BD
 1F468 200D 2695 FE0F
 1F468 200D 2696 FE0F
 1F468 200D 2708 FE0F
@@ -1035,10 +1064,17 @@
 1F469 1F3FB 200D 1F52C
 1F469 1F3FB 200D 1F680
 1F469 1F3FB 200D 1F692
+1F469 1F3FB 200D 1F91D 200D 1F468 1F3FC
+1F469 1F3FB 200D 1F91D 200D 1F468 1F3FD
+1F469 1F3FB 200D 1F91D 200D 1F468 1F3FE
+1F469 1F3FB 200D 1F91D 200D 1F468 1F3FF
+1F469 1F3FB 200D 1F9AF
 1F469 1F3FB 200D 1F9B0
 1F469 1F3FB 200D 1F9B1
 1F469 1F3FB 200D 1F9B2
 1F469 1F3FB 200D 1F9B3
+1F469 1F3FB 200D 1F9BC
+1F469 1F3FB 200D 1F9BD
 1F469 1F3FB 200D 2695 FE0F
 1F469 1F3FB 200D 2696 FE0F
 1F469 1F3FB 200D 2708 FE0F
@@ -1056,10 +1092,18 @@
 1F469 1F3FC 200D 1F52C
 1F469 1F3FC 200D 1F680
 1F469 1F3FC 200D 1F692
+1F469 1F3FC 200D 1F91D 200D 1F468 1F3FB
+1F469 1F3FC 200D 1F91D 200D 1F468 1F3FD
+1F469 1F3FC 200D 1F91D 200D 1F468 1F3FE
+1F469 1F3FC 200D 1F91D 200D 1F468 1F3FF
+1F469 1F3FC 200D 1F91D 200D 1F469 1F3FB
+1F469 1F3FC 200D 1F9AF
 1F469 1F3FC 200D 1F9B0
 1F469 1F3FC 200D 1F9B1
 1F469 1F3FC 200D 1F9B2
 1F469 1F3FC 200D 1F9B3
+1F469 1F3FC 200D 1F9BC
+1F469 1F3FC 200D 1F9BD
 1F469 1F3FC 200D 2695 FE0F
 1F469 1F3FC 200D 2696 FE0F
 1F469 1F3FC 200D 2708 FE0F
@@ -1077,10 +1121,19 @@
 1F469 1F3FD 200D 1F52C
 1F469 1F3FD 200D 1F680
 1F469 1F3FD 200D 1F692
+1F469 1F3FD 200D 1F91D 200D 1F468 1F3FB
+1F469 1F3FD 200D 1F91D 200D 1F468 1F3FC
+1F469 1F3FD 200D 1F91D 200D 1F468 1F3FE
+1F469 1F3FD 200D 1F91D 200D 1F468 1F3FF
+1F469 1F3FD 200D 1F91D 200D 1F469 1F3FB
+1F469 1F3FD 200D 1F91D 200D 1F469 1F3FC
+1F469 1F3FD 200D 1F9AF
 1F469 1F3FD 200D 1F9B0
 1F469 1F3FD 200D 1F9B1
 1F469 1F3FD 200D 1F9B2
 1F469 1F3FD 200D 1F9B3
+1F469 1F3FD 200D 1F9BC
+1F469 1F3FD 200D 1F9BD
 1F469 1F3FD 200D 2695 FE0F
 1F469 1F3FD 200D 2696 FE0F
 1F469 1F3FD 200D 2708 FE0F
@@ -1098,10 +1151,20 @@
 1F469 1F3FE 200D 1F52C
 1F469 1F3FE 200D 1F680
 1F469 1F3FE 200D 1F692
+1F469 1F3FE 200D 1F91D 200D 1F468 1F3FB
+1F469 1F3FE 200D 1F91D 200D 1F468 1F3FC
+1F469 1F3FE 200D 1F91D 200D 1F468 1F3FD
+1F469 1F3FE 200D 1F91D 200D 1F468 1F3FF
+1F469 1F3FE 200D 1F91D 200D 1F469 1F3FB
+1F469 1F3FE 200D 1F91D 200D 1F469 1F3FC
+1F469 1F3FE 200D 1F91D 200D 1F469 1F3FD
+1F469 1F3FE 200D 1F9AF
 1F469 1F3FE 200D 1F9B0
 1F469 1F3FE 200D 1F9B1
 1F469 1F3FE 200D 1F9B2
 1F469 1F3FE 200D 1F9B3
+1F469 1F3FE 200D 1F9BC
+1F469 1F3FE 200D 1F9BD
 1F469 1F3FE 200D 2695 FE0F
 1F469 1F3FE 200D 2696 FE0F
 1F469 1F3FE 200D 2708 FE0F
@@ -1119,10 +1182,21 @@
 1F469 1F3FF 200D 1F52C
 1F469 1F3FF 200D 1F680
 1F469 1F3FF 200D 1F692
+1F469 1F3FF 200D 1F91D 200D 1F468 1F3FB
+1F469 1F3FF 200D 1F91D 200D 1F468 1F3FC
+1F469 1F3FF 200D 1F91D 200D 1F468 1F3FD
+1F469 1F3FF 200D 1F91D 200D 1F468 1F3FE
+1F469 1F3FF 200D 1F91D 200D 1F469 1F3FB
+1F469 1F3FF 200D 1F91D 200D 1F469 1F3FC
+1F469 1F3FF 200D 1F91D 200D 1F469 1F3FD
+1F469 1F3FF 200D 1F91D 200D 1F469 1F3FE
+1F469 1F3FF 200D 1F9AF
 1F469 1F3FF 200D 1F9B0
 1F469 1F3FF 200D 1F9B1
 1F469 1F3FF 200D 1F9B2
 1F469 1F3FF 200D 1F9B3
+1F469 1F3FF 200D 1F9BC
+1F469 1F3FF 200D 1F9BD
 1F469 1F3FF 200D 2695 FE0F
 1F469 1F3FF 200D 2696 FE0F
 1F469 1F3FF 200D 2708 FE0F
@@ -1149,10 +1223,13 @@
 1F469 200D 1F52C
 1F469 200D 1F680
 1F469 200D 1F692
+1F469 200D 1F9AF
 1F469 200D 1F9B0
 1F469 200D 1F9B1
 1F469 200D 1F9B2
 1F469 200D 1F9B3
+1F469 200D 1F9BC
+1F469 200D 1F9BD
 1F469 200D 2695 FE0F
 1F469 200D 2696 FE0F
 1F469 200D 2708 FE0F
@@ -1163,8 +1240,23 @@
 1F46A
 1F46A FE0F
 1F46B
+1F46B 1F3FB
+1F46B 1F3FC
+1F46B 1F3FD
+1F46B 1F3FE
+1F46B 1F3FF
 1F46C
+1F46C 1F3FB
+1F46C 1F3FC
+1F46C 1F3FD
+1F46C 1F3FE
+1F46C 1F3FF
 1F46D
+1F46D 1F3FB
+1F46D 1F3FC
+1F46D 1F3FD
+1F46D 1F3FE
+1F46D 1F3FF
 1F46E
 1F46E 1F3FB
 1F46E 1F3FB 200D 2640 FE0F
@@ -2083,6 +2175,7 @@
 1F6D0
 1F6D1
 1F6D2
+1F6D5
 1F6E0 FE0F
 1F6E1 FE0F
 1F6E2 FE0F
@@ -2100,6 +2193,27 @@
 1F6F7
 1F6F8
 1F6F9
+1F6FA
+1F7E0
+1F7E1
+1F7E2
+1F7E3
+1F7E4
+1F7E5
+1F7E6
+1F7E7
+1F7E8
+1F7E9
+1F7EA
+1F7EB
+1F90D
+1F90E
+1F90F
+1F90F 1F3FB
+1F90F 1F3FC
+1F90F 1F3FD
+1F90F 1F3FE
+1F90F 1F3FF
 1F910
 1F911
 1F912
@@ -2340,6 +2454,7 @@
 1F93E 1F3FF 200D 2642 FE0F
 1F93E 200D 2640 FE0F
 1F93E 200D 2642 FE0F
+1F93F
 1F940
 1F941
 1F942
@@ -2388,11 +2503,13 @@
 1F96E
 1F96F
 1F970
+1F971
 1F973
 1F974
 1F975
 1F976
 1F97A
+1F97B
 1F97C
 1F97D
 1F97E
@@ -2432,6 +2549,14 @@
 1F9A0
 1F9A1
 1F9A2
+1F9A5
+1F9A6
+1F9A7
+1F9A8
+1F9A9
+1F9AA
+1F9AE
+1F9AF
 1F9B0
 1F9B1
 1F9B2
@@ -2486,16 +2611,105 @@
 1F9B9 1F3FF 200D 2642 FE0F
 1F9B9 200D 2640 FE0F
 1F9B9 200D 2642 FE0F
+1F9BA
+1F9BB
+1F9BB 1F3FB
+1F9BB 1F3FC
+1F9BB 1F3FD
+1F9BB 1F3FE
+1F9BB 1F3FF
+1F9BC
+1F9BD
+1F9BE
+1F9BF
 1F9C0
 1F9C1
 1F9C2
+1F9C3
+1F9C4
+1F9C5
+1F9C6
+1F9C7
+1F9C8
+1F9C9
+1F9CA
+1F9CD
+1F9CD 1F3FB
+1F9CD 1F3FB 200D 2640 FE0F
+1F9CD 1F3FB 200D 2642 FE0F
+1F9CD 1F3FC
+1F9CD 1F3FC 200D 2640 FE0F
+1F9CD 1F3FC 200D 2642 FE0F
+1F9CD 1F3FD
+1F9CD 1F3FD 200D 2640 FE0F
+1F9CD 1F3FD 200D 2642 FE0F
+1F9CD 1F3FE
+1F9CD 1F3FE 200D 2640 FE0F
+1F9CD 1F3FE 200D 2642 FE0F
+1F9CD 1F3FF
+1F9CD 1F3FF 200D 2640 FE0F
+1F9CD 1F3FF 200D 2642 FE0F
+1F9CD 200D 2640 FE0F
+1F9CD 200D 2642 FE0F
+1F9CE
+1F9CE 1F3FB
+1F9CE 1F3FB 200D 2640 FE0F
+1F9CE 1F3FB 200D 2642 FE0F
+1F9CE 1F3FC
+1F9CE 1F3FC 200D 2640 FE0F
+1F9CE 1F3FC 200D 2642 FE0F
+1F9CE 1F3FD
+1F9CE 1F3FD 200D 2640 FE0F
+1F9CE 1F3FD 200D 2642 FE0F
+1F9CE 1F3FE
+1F9CE 1F3FE 200D 2640 FE0F
+1F9CE 1F3FE 200D 2642 FE0F
+1F9CE 1F3FF
+1F9CE 1F3FF 200D 2640 FE0F
+1F9CE 1F3FF 200D 2642 FE0F
+1F9CE 200D 2640 FE0F
+1F9CE 200D 2642 FE0F
+1F9CF
+1F9CF 1F3FB
+1F9CF 1F3FB 200D 2640 FE0F
+1F9CF 1F3FB 200D 2642 FE0F
+1F9CF 1F3FC
+1F9CF 1F3FC 200D 2640 FE0F
+1F9CF 1F3FC 200D 2642 FE0F
+1F9CF 1F3FD
+1F9CF 1F3FD 200D 2640 FE0F
+1F9CF 1F3FD 200D 2642 FE0F
+1F9CF 1F3FE
+1F9CF 1F3FE 200D 2640 FE0F
+1F9CF 1F3FE 200D 2642 FE0F
+1F9CF 1F3FF
+1F9CF 1F3FF 200D 2640 FE0F
+1F9CF 1F3FF 200D 2642 FE0F
+1F9CF 200D 2640 FE0F
+1F9CF 200D 2642 FE0F
 1F9D0
 1F9D1
 1F9D1 1F3FB
+1F9D1 1F3FB 200D 1F91D 200D 1F9D1 1F3FB
 1F9D1 1F3FC
+1F9D1 1F3FC 200D 1F91D 200D 1F9D1 1F3FB
+1F9D1 1F3FC 200D 1F91D 200D 1F9D1 1F3FC
 1F9D1 1F3FD
+1F9D1 1F3FD 200D 1F91D 200D 1F9D1 1F3FB
+1F9D1 1F3FD 200D 1F91D 200D 1F9D1 1F3FC
+1F9D1 1F3FD 200D 1F91D 200D 1F9D1 1F3FD
 1F9D1 1F3FE
+1F9D1 1F3FE 200D 1F91D 200D 1F9D1 1F3FB
+1F9D1 1F3FE 200D 1F91D 200D 1F9D1 1F3FC
+1F9D1 1F3FE 200D 1F91D 200D 1F9D1 1F3FD
+1F9D1 1F3FE 200D 1F91D 200D 1F9D1 1F3FE
 1F9D1 1F3FF
+1F9D1 1F3FF 200D 1F91D 200D 1F9D1 1F3FB
+1F9D1 1F3FF 200D 1F91D 200D 1F9D1 1F3FC
+1F9D1 1F3FF 200D 1F91D 200D 1F9D1 1F3FD
+1F9D1 1F3FF 200D 1F91D 200D 1F9D1 1F3FE
+1F9D1 1F3FF 200D 1F91D 200D 1F9D1 1F3FF
+1F9D1 200D 1F91D 200D 1F9D1
 1F9D2
 1F9D2 1F3FB
 1F9D2 1F3FC
@@ -2702,6 +2916,22 @@
 1F9FD
 1F9FE
 1F9FF
+1FA70
+1FA71
+1FA72
+1FA73
+1FA78
+1FA79
+1FA7A
+1FA80
+1FA81
+1FA82
+1FA90
+1FA91
+1FA92
+1FA93
+1FA94
+1FA95
 203C FE0F
 2049 FE0F
 2122 FE0F
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/fonts.mk b/fonts.mk
index 1cccd97..fee43e2 100644
--- a/fonts.mk
+++ b/fonts.mk
@@ -121,10 +121,12 @@
     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 \
+    NotoSansMyanmar-Bold.otf \
+    NotoSansMyanmar-Medium.otf \
+    NotoSansMyanmar-Regular.otf \
+    NotoSansMyanmarUI-Bold.otf \
+    NotoSansMyanmarUI-Medium.otf \
+    NotoSansMyanmarUI-Regular.otf \
     NotoSansNabataean-Regular.otf \
     NotoSansNewa-Regular.otf \
     NotoSansNewTaiLue-Regular.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..d439501
--- /dev/null
+++ b/other/Android.bp
@@ -0,0 +1,1088 @@
+// 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.otf",
+    src: "NotoSansMyanmar-Bold.otf",
+}
+
+prebuilt_font {
+    name: "NotoSansMyanmar-Medium.otf",
+    src: "NotoSansMyanmar-Medium.otf",
+}
+
+prebuilt_font {
+    name: "NotoSansMyanmar-Regular.otf",
+    src: "NotoSansMyanmar-Regular.otf",
+}
+
+prebuilt_font {
+    name: "NotoSansMyanmarUI-Bold.otf",
+    src: "NotoSansMyanmarUI-Bold.otf",
+}
+
+prebuilt_font {
+    name: "NotoSansMyanmarUI-Medium.otf",
+    src: "NotoSansMyanmarUI-Medium.otf",
+}
+
+prebuilt_font {
+    name: "NotoSansMyanmarUI-Regular.otf",
+    src: "NotoSansMyanmarUI-Regular.otf",
+}
+
+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",
+}
diff --git a/other/NotoSansMyanmar-Bold-ZawDecode.ttf b/other/NotoSansMyanmar-Bold-ZawDecode.ttf
deleted file mode 100644
index f2ac78b..0000000
--- a/other/NotoSansMyanmar-Bold-ZawDecode.ttf
+++ /dev/null
Binary files differ
diff --git a/other/NotoSansMyanmar-Regular-ZawDecode.ttf b/other/NotoSansMyanmar-Regular-ZawDecode.ttf
deleted file mode 100644
index c9d5dbc..0000000
--- a/other/NotoSansMyanmar-Regular-ZawDecode.ttf
+++ /dev/null
Binary files differ
diff --git a/other/NotoSansMyanmarUI-Bold-ZawDecode.ttf b/other/NotoSansMyanmarUI-Bold-ZawDecode.ttf
deleted file mode 100644
index d27c526..0000000
--- a/other/NotoSansMyanmarUI-Bold-ZawDecode.ttf
+++ /dev/null
Binary files differ
diff --git a/other/NotoSansMyanmarUI-Regular-ZawDecode.ttf b/other/NotoSansMyanmarUI-Regular-ZawDecode.ttf
deleted file mode 100644
index 3dc93d5..0000000
--- a/other/NotoSansMyanmarUI-Regular-ZawDecode.ttf
+++ /dev/null
Binary files differ
diff --git a/other/NotoSansTifinagh-Regular.ttf b/other/NotoSansTifinagh-Regular.ttf
index 9692944..252a0dc 100644
--- a/other/NotoSansTifinagh-Regular.ttf
+++ b/other/NotoSansTifinagh-Regular.ttf
Binary files differ