From cbd098920d3f358312302f76b520a33536c0d0cb Mon Sep 17 00:00:00 2001
From: Roozbeh Pournader <roozbeh@google.com>
Date: Wed, 9 Jul 2014 09:33:04 -0700
Subject: [PATCH] Remove the monochrome AndroidEmoji font.

All characters are now supported in other fonts in the fallback chain:
U+303D is supported in Noto Color Emoji, everything else is supported in
the subsettd Noto Sans Symbols.

Bug: 15777351
Change-Id: Ibf4bbffbfdddfa9e0f08ceff96c835ffeb3e555d
---
 data/fonts/Android.mk         |   3 +--
 data/fonts/AndroidEmoji.ttf   | Bin 2760 -> 0 bytes
 data/fonts/fallback_fonts.xml |   5 -----
 data/fonts/fonts.mk           |   1 -
 4 files changed, 1 insertion(+), 8 deletions(-)
 delete mode 100644 data/fonts/AndroidEmoji.ttf

diff --git a/data/fonts/Android.mk b/data/fonts/Android.mk
index 86a45c514b6c7..9f6b64cb921f5 100644
--- a/data/fonts/Android.mk
+++ b/data/fonts/Android.mk
@@ -137,8 +137,7 @@ font_src_files += \
     RobotoCondensed-Italic.ttf \
     RobotoCondensed-BoldItalic.ttf \
     RobotoCondensed-Light.ttf \
-    RobotoCondensed-LightItalic.ttf \
-    AndroidEmoji.ttf
+    RobotoCondensed-LightItalic.ttf
 
 endif # !MINIMAL_FONT
 
diff --git a/data/fonts/AndroidEmoji.ttf b/data/fonts/AndroidEmoji.ttf
deleted file mode 100644
index 8bdc26ac7945ccf4d1a1199c0789f20f0cb25f04..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2760
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
BSr-5R

diff --git a/data/fonts/fallback_fonts.xml b/data/fonts/fallback_fonts.xml
index 37e9b157e750f..a7e159af8c35b 100644
--- a/data/fonts/fallback_fonts.xml
+++ b/data/fonts/fallback_fonts.xml
@@ -262,11 +262,6 @@
             <file>NotoSansSymbols-Regular-Subsetted.ttf</file>
         </fileset>
     </family>
-    <family>
-        <fileset>
-            <file>AndroidEmoji.ttf</file>
-        </fileset>
-    </family>
     <family>
         <fileset>
             <file>NotoColorEmoji.ttf</file>
diff --git a/data/fonts/fonts.mk b/data/fonts/fonts.mk
index 70fc6a2df6aa2..2ff201039f436 100644
--- a/data/fonts/fonts.mk
+++ b/data/fonts/fonts.mk
@@ -39,7 +39,6 @@ PRODUCT_PACKAGES := \
     RobotoCondensed-Light.ttf \
     RobotoCondensed-LightItalic.ttf \
     DroidSansMono.ttf \
-    AndroidEmoji.ttf \
     Clockopia.ttf \
     AndroidClock.ttf \
     AndroidClock_Highlight.ttf \