summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--data/fonts/Android.mk3
-rw-r--r--data/fonts/AndroidEmoji.ttfbin3502396 -> 0 bytes
-rw-r--r--data/fonts/fallback_fonts.xml2
-rw-r--r--data/fonts/fonts.mk1
4 files changed, 2 insertions, 4 deletions
diff --git a/data/fonts/Android.mk b/data/fonts/Android.mk
index 0d9a386..2846e61 100644
--- a/data/fonts/Android.mk
+++ b/data/fonts/Android.mk
@@ -138,8 +138,7 @@ font_src_files += \
DroidSansHebrew-Regular.ttf \
DroidSansHebrew-Bold.ttf \
DroidSansArmenian.ttf \
- DroidSansGeorgian.ttf \
- AndroidEmoji.ttf
+ DroidSansGeorgian.ttf
endif # !MINIMAL_FONT
diff --git a/data/fonts/AndroidEmoji.ttf b/data/fonts/AndroidEmoji.ttf
deleted file mode 100644
index 569cbab..0000000
--- a/data/fonts/AndroidEmoji.ttf
+++ /dev/null
Binary files differ
diff --git a/data/fonts/fallback_fonts.xml b/data/fonts/fallback_fonts.xml
index 1198aba..69db6aa 100644
--- a/data/fonts/fallback_fonts.xml
+++ b/data/fonts/fallback_fonts.xml
@@ -186,7 +186,7 @@
</family>
<family>
<fileset>
- <file>AndroidEmoji.ttf</file>
+ <file>NotoColorEmoji.ttf</file>
</fileset>
</family>
<family>
diff --git a/data/fonts/fonts.mk b/data/fonts/fonts.mk
index 05cca13..a677c4f 100644
--- a/data/fonts/fonts.mk
+++ b/data/fonts/fonts.mk
@@ -43,7 +43,6 @@ PRODUCT_PACKAGES := \
DroidSansMono.ttf \
DroidSansArmenian.ttf \
DroidSansGeorgian.ttf \
- AndroidEmoji.ttf \
Clockopia.ttf \
AndroidClock.ttf \
AndroidClock_Highlight.ttf \