summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoozbeh Pournader <roozbeh@google.com>2014-07-07 16:10:15 -0700
committerRoozbeh Pournader <roozbeh@google.com>2014-07-07 16:10:15 -0700
commitce5a6bfd7b940cc656ecb6a0342257b50d8219f4 (patch)
tree8029376734c15839fc48780a75b3f424785b49c2
parent95f621a1a4a0891075f1f9daf8e0323aab488793 (diff)
downloadframeworks_base-ce5a6bfd7b940cc656ecb6a0342257b50d8219f4.zip
frameworks_base-ce5a6bfd7b940cc656ecb6a0342257b50d8219f4.tar.gz
frameworks_base-ce5a6bfd7b940cc656ecb6a0342257b50d8219f4.tar.bz2
Re-enable Motoya in the extended font builds.
The font is now included in all non-smaller font builds, as opposed to the previous "not smaller but not extended either" builds. This is in sync with not including Noto Sans Japanese in the extended build. Change-Id: Id0f79bc1de714ac876a601c4867a55b6dbfc820c
-rw-r--r--data/fonts/Android.mk2
1 files changed, 0 insertions, 2 deletions
diff --git a/data/fonts/Android.mk b/data/fonts/Android.mk
index 6437e07..86a45c5 100644
--- a/data/fonts/Android.mk
+++ b/data/fonts/Android.mk
@@ -56,7 +56,6 @@ else # !SMALLER_FONT_FOOTPRINT
droidsans_fallback_src := DroidSansFallbackFull.ttf
-ifneq ($(EXTENDED_FONT_FOOTPRINT),true)
include $(CLEAR_VARS)
LOCAL_MODULE := MTLmr3m.ttf
LOCAL_SRC_FILES := $(LOCAL_MODULE)
@@ -65,7 +64,6 @@ LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_PATH := $(TARGET_OUT)/fonts
include $(BUILD_PREBUILT)
extra_font_files += MTLmr3m.ttf
-endif # !EXTENDED_FONT_FOOTPRINT
endif # SMALLER_FONT_FOOTPRINT