Merge EXTENDED font bucket with the next (unnamed) bucket.

This is now possible since we have less space restrictions on
devices.

This helps make sure that devices don't mistakenly ship with a
limited font support simply because they didn't turn on the extended
font profile.

The subsetted Noto Color Emoji font is also removed, since it's no
longer used in any font profile.

Bug: 19668057
Change-Id: Ib67bea2ef94ff8a6ee2657083a65500bee1872dc

2 files changed, 45 insertions, 78 deletions

diff --git a/Android.mk b/Android.mk
index bcd95ef..f6e19ff 100644
--- a/Android.mk
+++ b/Android.mk
@@ -14,8 +14,8 @@
 
 NOTO_DIR := $(call my-dir)
 
-# Use full Noto Sans Japanese font on extended footprint
-ifeq ($(EXTENDED_FONT_FOOTPRINT),true)
+# Use full Noto Sans Japanese font on non-smaller footprints
+ifneq ($(SMALLER_FONT_FOOTPRINT),true)
 FONT_NOTOSANS_JP_FULL := true
 endif
 
@@ -38,10 +38,9 @@ endef
 
 #############################################################################
 # First "build" the Noto CJK fonts, which have their own directory and
-# license. These are only included in EXTENDED_FONT_FOOTPRINT builds.
+# license. These are not included in SMALLER_FONT_FOOTPRINT builds.
 #############################################################################
-
-ifeq ($(EXTENDED_FONT_FOOTPRINT),true)
+ifneq ($(SMALLER_FONT_FOOTPRINT),true)
 LOCAL_PATH := $(NOTO_DIR)/cjk
 
 font_src_files := \
@@ -71,8 +70,7 @@ LOCAL_MODULE_PATH := $(TARGET_OUT)/fonts
 include $(BUILD_PREBUILT)
 
 noto_sans_jp_src :=
-
-endif # EXTENDED_FONT_FOOTPRINT
+endif # !SMALLER_FONT_FOOTPRINT
 
 
 #############################################################################
@@ -91,13 +89,18 @@ font_src_files := \
     NotoSerif-BoldItalic.ttf
 
 #############################################################################
-# The following fonts are only included in EXTENDED_FONT_FOOTPRINT builds.
+# The following fonts are excluded from SMALLER_FONT_FOOTPRINT builds.
 #############################################################################
-ifeq ($(EXTENDED_FONT_FOOTPRINT),true)
+ifneq ($(SMALLER_FONT_FOOTPRINT),true)
 font_src_files += \
+    NotoColorEmoji.ttf \
     NotoSansBalinese-Regular.ttf \
     NotoSansBamum-Regular.ttf \
     NotoSansBatak-Regular.ttf \
+    NotoSansBengali-Regular.ttf \
+    NotoSansBengali-Bold.ttf \
+    NotoSansBengaliUI-Regular.ttf \
+    NotoSansBengaliUI-Bold.ttf \
     NotoSansBuginese-Regular.ttf \
     NotoSansBuhid-Regular.ttf \
     NotoSansCanadianAboriginal-Regular.ttf \
@@ -105,6 +108,12 @@ font_src_files += \
     NotoSansCham-Bold.ttf \
     NotoSansCherokee-Regular.ttf \
     NotoSansCoptic-Regular.ttf \
+    NotoSansDevanagari-Regular.ttf \
+    NotoSansDevanagari-Bold.ttf \
+    NotoSansDevanagariUI-Regular.ttf \
+    NotoSansDevanagariUI-Bold.ttf \
+    NotoSansEthiopic-Regular.ttf \
+    NotoSansEthiopic-Bold.ttf \
     NotoSansGlagolitic-Regular.ttf \
     NotoSansGujarati-Regular.ttf \
     NotoSansGujarati-Bold.ttf \
@@ -116,13 +125,33 @@ font_src_files += \
     NotoSansGurmukhiUI-Bold.ttf \
     NotoSansHanunoo-Regular.ttf \
     NotoSansJavanese-Regular.ttf \
+    NotoSansKannada-Regular.ttf \
+    NotoSansKannada-Bold.ttf \
+    NotoSansKannadaUI-Regular.ttf \
+    NotoSansKannadaUI-Bold.ttf \
     NotoSansKayahLi-Regular.ttf \
+    NotoSansKhmer-Regular.ttf \
+    NotoSansKhmer-Bold.ttf \
+    NotoSansKhmerUI-Regular.ttf \
+    NotoSansKhmerUI-Bold.ttf \
+    NotoSansLao-Regular.ttf \
+    NotoSansLao-Bold.ttf \
+    NotoSansLaoUI-Regular.ttf \
+    NotoSansLaoUI-Bold.ttf \
     NotoSansLepcha-Regular.ttf \
     NotoSansLimbu-Regular.ttf \
     NotoSansLisu-Regular.ttf \
+    NotoSansMalayalam-Regular.ttf \
+    NotoSansMalayalam-Bold.ttf \
+    NotoSansMalayalamUI-Regular.ttf \
+    NotoSansMalayalamUI-Bold.ttf \
     NotoSansMandaic-Regular.ttf \
     NotoSansMeeteiMayek-Regular.ttf \
     NotoSansMongolian-Regular.ttf \
+    NotoSansMyanmar-Regular.ttf \
+    NotoSansMyanmar-Bold.ttf \
+    NotoSansMyanmarUI-Regular.ttf \
+    NotoSansMyanmarUI-Bold.ttf \
     NotoSansNewTaiLue-Regular.ttf \
     NotoSansNKo-Regular.ttf \
     NotoSansOlChiki-Regular.ttf \
@@ -141,49 +170,6 @@ font_src_files += \
     NotoSansTaiLe-Regular.ttf \
     NotoSansTaiTham-Regular.ttf \
     NotoSansTaiViet-Regular.ttf \
-    NotoSansThaana-Regular.ttf \
-    NotoSansThaana-Bold.ttf \
-    NotoSansTibetan-Regular.ttf \
-    NotoSansTifinagh-Regular.ttf \
-    NotoSansVai-Regular.ttf \
-    NotoSansYi-Regular.ttf
-endif # EXTENDED_FONT_FOOTPRINT
-
-#############################################################################
-# The following fonts are excluded from SMALLER_FONT_FOOTPRINT builds.
-#############################################################################
-ifneq ($(SMALLER_FONT_FOOTPRINT),true)
-font_src_files += \
-    NotoSansBengali-Regular.ttf \
-    NotoSansBengali-Bold.ttf \
-    NotoSansBengaliUI-Regular.ttf \
-    NotoSansBengaliUI-Bold.ttf \
-    NotoSansDevanagari-Regular.ttf \
-    NotoSansDevanagari-Bold.ttf \
-    NotoSansDevanagariUI-Regular.ttf \
-    NotoSansDevanagariUI-Bold.ttf \
-    NotoSansEthiopic-Regular.ttf \
-    NotoSansEthiopic-Bold.ttf \
-    NotoSansKannada-Regular.ttf \
-    NotoSansKannada-Bold.ttf \
-    NotoSansKannadaUI-Regular.ttf \
-    NotoSansKannadaUI-Bold.ttf \
-    NotoSansKhmer-Regular.ttf \
-    NotoSansKhmer-Bold.ttf \
-    NotoSansKhmerUI-Regular.ttf \
-    NotoSansKhmerUI-Bold.ttf \
-    NotoSansLao-Regular.ttf \
-    NotoSansLao-Bold.ttf \
-    NotoSansLaoUI-Regular.ttf \
-    NotoSansLaoUI-Bold.ttf \
-    NotoSansMalayalam-Regular.ttf \
-    NotoSansMalayalam-Bold.ttf \
-    NotoSansMalayalamUI-Regular.ttf \
-    NotoSansMalayalamUI-Bold.ttf \
-    NotoSansMyanmar-Regular.ttf \
-    NotoSansMyanmar-Bold.ttf \
-    NotoSansMyanmarUI-Regular.ttf \
-    NotoSansMyanmarUI-Bold.ttf \
     NotoSansTamil-Regular.ttf \
     NotoSansTamil-Bold.ttf \
     NotoSansTamilUI-Regular.ttf \
@@ -192,10 +178,16 @@ font_src_files += \
     NotoSansTelugu-Bold.ttf \
     NotoSansTeluguUI-Regular.ttf \
     NotoSansTeluguUI-Bold.ttf \
+    NotoSansThaana-Regular.ttf \
+    NotoSansThaana-Bold.ttf \
     NotoSansThai-Regular.ttf \
     NotoSansThai-Bold.ttf \
     NotoSansThaiUI-Regular.ttf \
-    NotoSansThaiUI-Bold.ttf
+    NotoSansThaiUI-Bold.ttf \
+    NotoSansTibetan-Regular.ttf \
+    NotoSansTifinagh-Regular.ttf \
+    NotoSansVai-Regular.ttf \
+    NotoSansYi-Regular.ttf
 endif # !SMALLER_FONT_FOOTPRINT
 
 #############################################################################
@@ -219,28 +211,3 @@ endif # !MINIMAL_FONT_FOOTPRINT
 $(foreach f, $(font_src_files), $(call build-one-font-module, $(f)))
 build-one-font-module :=
 font_src_files :=
-
-#############################################################################
-# Use Noto Color Emoji with all the flags on EXTENDED_FONT_FOOTPRINT builds,
-# but without it on other builds. On SMALLER_FONT_FOOTPRINT devices, no
-# color emoji font is included.
-#############################################################################
-ifneq ($(SMALLER_FONT_FOOTPRINT),true)
-
-ifeq ($(EXTENDED_FONT_FOOTPRINT),true)
-color_emoji_src := NotoColorEmoji.ttf
-else  # !EXTENDED_FONT_FOOTPRINT
-color_emoji_src := NotoColorEmoji-Subsetted.ttf
-endif # EXTENDED_FONT_FOOTPRINT
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := NotoColorEmoji.ttf
-LOCAL_SRC_FILES := $(color_emoji_src)
-LOCAL_MODULE_CLASS := ETC
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_PATH := $(TARGET_OUT)/fonts
-include $(BUILD_PREBUILT)
-
-color_emoji_src :=
-
-endif # !SMALLER_FONT_FOOTPRINT
diff --git a/other/NotoColorEmoji-Subsetted.ttf b/other/NotoColorEmoji-Subsetted.ttf
deleted file mode 100644
index 112a4d5..0000000
--- a/other/NotoColorEmoji-Subsetted.ttf
+++ /dev/null