diff options
| author | Kris Giesing <kgiesing@google.com> | 2015-03-27 17:20:31 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-03-27 17:20:33 +0000 |
| commit | 7a2721bd59e230bef0aa6b09dd3dd9533d582ad6 (patch) | |
| tree | aad0bcb8650f67cddc9628c1694f9c5aecdc6e5f | |
| parent | 1e650e26a7bb2f02635530a46ecd715f9911d40e (diff) | |
| parent | 6180e5b8fd17b30d75f3f02a482c993fa04db0f0 (diff) | |
| download | frameworks_base-7a2721bd59e230bef0aa6b09dd3dd9533d582ad6.zip frameworks_base-7a2721bd59e230bef0aa6b09dd3dd9533d582ad6.tar.gz frameworks_base-7a2721bd59e230bef0aa6b09dd3dd9533d582ad6.tar.bz2 | |
Merge "Allow override of Motoya with full NotoSans"
| -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 ################################ |