From 0c37f926e6a83d4d24b2a8fe562a858b4c565eac Mon Sep 17 00:00:00 2001 From: Siyamed Sinir Date: Thu, 12 Jul 2018 12:02:18 -0700 Subject: [PATCH] Remove requirement for kiss emoji should have gender Test: m fontchain_lint Test: m Test: Visual test on device after full build Bug: 110037531 Change-Id: Iac26c7c7c0e1a8a500a93f19d99831113529b201 (cherry picked from commit 77a1b149109d99ff2c73d1b8ba9a943e6961af48) --- tools/fonts/fontchain_linter.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tools/fonts/fontchain_linter.py b/tools/fonts/fontchain_linter.py index a8411aa5c488e..ce9becd40b1ea 100755 --- a/tools/fonts/fontchain_linter.py +++ b/tools/fonts/fontchain_linter.py @@ -524,9 +524,12 @@ LEGACY_ANDROID_EMOJI = { 0xFE837: (ord('0'), COMBINING_KEYCAP), } +# This is used to define the emoji that should have the same glyph. +# i.e. previously we had gender based Kiss (0x1F48F), which had the same glyph +# with Kiss: Woman, Man (0x1F469, 0x200D, 0x2764, 0x200D, 0x1F48B, 0x200D, 0x1F468) +# in that case a valid row would be: +# (0x1F469, 0x200D, 0x2764, 0x200D, 0x1F48B, 0x200D, 0x1F468): 0x1F48F, ZWJ_IDENTICALS = { - # KISS - (0x1F469, 0x200D, 0x2764, 0x200D, 0x1F48B, 0x200D, 0x1F468): 0x1F48F, } SAME_FLAG_MAPPINGS = [