diff options
| author | Roozbeh Pournader <roozbeh@google.com> | 2015-04-29 22:47:59 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-29 22:48:06 +0000 |
| commit | 09404dd159d7ad7ade0c70f95a24d357d56bcdb4 (patch) | |
| tree | b735aec353fd0c2c9bde1e16d1baf1b8e4dad333 /data | |
| parent | fa4eda443e32bf050721148c1ec5c6602246835a (diff) | |
| parent | 5f49c28bfcdd43277b155da65c9312109fac142c (diff) | |
| download | frameworks_base-09404dd159d7ad7ade0c70f95a24d357d56bcdb4.zip frameworks_base-09404dd159d7ad7ade0c70f95a24d357d56bcdb4.tar.gz frameworks_base-09404dd159d7ad7ade0c70f95a24d357d56bcdb4.tar.bz2 | |
Merge "Rename FONT_NOTOSANS_FULL to FONT_NOTOSANS_JP_FULL." into mnc-dev
Diffstat (limited to 'data')
| -rw-r--r-- | data/fonts/Android.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/data/fonts/Android.mk b/data/fonts/Android.mk index a0b26f3..1ea459f 100644 --- a/data/fonts/Android.mk +++ b/data/fonts/Android.mk @@ -50,7 +50,7 @@ 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) +ifneq ($(FONT_NOTOSANS_JP_FULL),true) include $(CLEAR_VARS) LOCAL_MODULE := MTLmr3m.ttf @@ -61,7 +61,7 @@ LOCAL_MODULE_PATH := $(TARGET_OUT)/fonts include $(BUILD_PREBUILT) extra_font_files += MTLmr3m.ttf -endif # !FONT_NOTOSANS_FULL +endif # !FONT_NOTOSANS_JP_FULL endif # !SMALLER_FONT_FOOTPRINT ################################ |