diff options
| author | Roozbeh Pournader <roozbeh@google.com> | 2016-12-09 19:21:01 -0800 |
|---|---|---|
| committer | Roozbeh Pournader <roozbeh@google.com> | 2016-12-13 22:53:52 +0000 |
| commit | aba60b542e5e60288262429fbec5a5a8724c313f (patch) | |
| tree | 9a157174e11d6c354c03236a5282b062492a718e | |
| parent | e70c9095b02ec46111c3e3677b43dab1a78e6188 (diff) | |
Remove Droid Sans Fallback from all builds
Droid Sans Fallback is now completely replaced by Noto Sans CJK. The
font files are kept in the tree, since the SDK still needs them.
Also, Android.mk is updated to reflect the fact that Noto Color Emoji
is now included in SMALLER_FONT_FOOTPRINT, so fontchain_lint checks
for emoji consistency in that footprint too.
Bug: 31854008
Test: make fontchain_lint
Change-Id: I4f57114a48ecfaee87b49f01f7ef4fa5cd0b19fb
| -rw-r--r-- | data/fonts/Android.mk | 19 | ||||
| -rw-r--r-- | data/fonts/fonts.mk | 3 | ||||
| -rw-r--r-- | data/fonts/fonts.xml | 3 |
3 files changed, 3 insertions, 22 deletions
diff --git a/data/fonts/Android.mk b/data/fonts/Android.mk index f4c5b53dd36b..5baa75b8aac3 100644 --- a/data/fonts/Android.mk +++ b/data/fonts/Android.mk @@ -13,7 +13,7 @@ # limitations under the License. # We have to use BUILD_PREBUILT instead of PRODUCT_COPY_FIES, -# because SMALLER_FONT_FOOTPRINT is only available in Android.mks. +# because MINIMAL_FONT_FOOTPRINT is only available in Android.mks. LOCAL_PATH := $(call my-dir) @@ -59,21 +59,6 @@ include $(BUILD_PREBUILT) extra_font_files := ################################ -# Include the DroidSansFallback subset on SMALLER_FONT_FOOTPRINT build -ifeq ($(SMALLER_FONT_FOOTPRINT),true) - -include $(CLEAR_VARS) -LOCAL_MODULE := DroidSansFallback.ttf -LOCAL_SRC_FILES := $(LOCAL_MODULE) -LOCAL_MODULE_CLASS := ETC -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_PATH := $(TARGET_OUT)/fonts -include $(BUILD_PREBUILT) -droidsans_fallback_src := - -endif # SMALLER_FONT_FOOTPRINT - -################################ # Build the rest of font files as prebuilt. # $(1): The source file name in LOCAL_PATH. @@ -101,7 +86,7 @@ font_src_files := checkbuild: fontchain_lint FONTCHAIN_LINTER := frameworks/base/tools/fonts/fontchain_lint.py -ifeq ($(SMALLER_FONT_FOOTPRINT),true) +ifeq ($(MINIMAL_FONT_FOOTPRINT),true) CHECK_EMOJI := false else CHECK_EMOJI := true diff --git a/data/fonts/fonts.mk b/data/fonts/fonts.mk index acd785ede249..23c54aec62fe 100644 --- a/data/fonts/fonts.mk +++ b/data/fonts/fonts.mk @@ -18,6 +18,5 @@ PRODUCT_COPY_FILES := \ frameworks/base/data/fonts/fonts.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/fonts.xml PRODUCT_PACKAGES := \ - DroidSansFallback.ttf \ DroidSansMono.ttf \ - AndroidClock.ttf \ + AndroidClock.ttf diff --git a/data/fonts/fonts.xml b/data/fonts/fonts.xml index 345ec378746a..465e20731654 100644 --- a/data/fonts/fonts.xml +++ b/data/fonts/fonts.xml @@ -353,9 +353,6 @@ <family lang="und-Zsym"> <font weight="400" style="normal">NotoSansSymbols-Regular-Subsetted2.ttf</font> </family> - <family> - <font weight="400" style="normal">DroidSansFallback.ttf</font> - </family> <!-- Tai Le and Mongolian are intentionally kept last, to make sure they don't override the East Asian punctuation for Chinese. |