diff options
| author | Kris Giesing <kgiesing@google.com> | 2015-03-26 15:37:46 -0700 |
|---|---|---|
| committer | Kris Giesing <kgiesing@google.com> | 2015-03-26 15:37:46 -0700 |
| commit | 6180e5b8fd17b30d75f3f02a482c993fa04db0f0 (patch) | |
| tree | 99b1fd6cdfdf03e0e75f9427b5fa1a628410d710 | |
| parent | ce2425c3dd306bb05f9e3d21e17db8bb64c0990a (diff) | |
| download | frameworks_base-6180e5b8fd17b30d75f3f02a482c993fa04db0f0.zip frameworks_base-6180e5b8fd17b30d75f3f02a482c993fa04db0f0.tar.gz frameworks_base-6180e5b8fd17b30d75f3f02a482c993fa04db0f0.tar.bz2 | |
Allow override of Motoya with full NotoSans
b/17599829
Change-Id: I619288eadb8bf814b08dca833f540a80e38c2123
| -rw-r--r-- | data/fonts/Android.mk | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/data/fonts/Android.mk b/data/fonts/Android.mk index 38321a3..a0b26f3 100644 --- a/data/fonts/Android.mk +++ b/data/fonts/Android.mk @@ -49,6 +49,8 @@ extra_font_files := \ ################################ # Do not include Motoya on space-constrained devices ifneq ($(SMALLER_FONT_FOOTPRINT),true) +# Do not include Motoya if we are including full NotoSans +ifneq ($(FONT_NOTOSANS_FULL),true) include $(CLEAR_VARS) LOCAL_MODULE := MTLmr3m.ttf @@ -59,6 +61,7 @@ LOCAL_MODULE_PATH := $(TARGET_OUT)/fonts include $(BUILD_PREBUILT) extra_font_files += MTLmr3m.ttf +endif # !FONT_NOTOSANS_FULL endif # !SMALLER_FONT_FOOTPRINT ################################ |