diff options
| author | 2015-08-05 03:04:58 +0000 | |
|---|---|---|
| committer | 2015-08-05 03:04:58 +0000 | |
| commit | 519adb50ebd45b8ecd1a8b8abbb975e35bb42974 (patch) | |
| tree | 67c895a69b5963ef6e625b897f9f834c53016b79 | |
| parent | 54cea23479b6c44c5ac40b4f34edf29df311bb91 (diff) | |
| parent | 9e21eced5efacd605036be599d96974964deb09b (diff) | |
Merge "Create a special CONSTRAINED font bucket in frameworks." into mnc-dev
| -rw-r--r-- | data/fonts/Android.mk | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/data/fonts/Android.mk b/data/fonts/Android.mk index 3181017a2e5a..39458f913abe 100644 --- a/data/fonts/Android.mk +++ b/data/fonts/Android.mk @@ -17,10 +17,13 @@ LOCAL_PATH := $(call my-dir) -# Use full Noto Sans Japanese font on non-smaller footprints +# Use full Noto Sans Japanese font on the normal footprints, but +# exclude it from SMALLER and use a subset on the CONSTRAINED ones. ifneq ($(SMALLER_FONT_FOOTPRINT),true) +ifneq ($(CONSTRAINED_FONT_FOOTPRINT),true) FONT_NOTOSANS_JP_FULL := true endif +endif ########################################## # create symlink for given font @@ -82,19 +85,32 @@ include $(BUILD_PREBUILT) extra_font_files := ################################ -# Include the DroidSansFallback subset on SMALLER_FONT_FOOTPRINT build +# Include the DroidSansFallback subset on SMALLER_FONT_FOOTPRINT builds, +# and the full font on CONSTRAINED_FONT_FOOTPRINT ones. ifeq ($(SMALLER_FONT_FOOTPRINT),true) +droidsans_fallback_src := DroidSansFallback.ttf +build_droidsans_fallback := true +endif # SMALLER_FONT_FOOTPRINT + +ifeq ($(CONSTRAINED_FONT_FOOTPRINT),true) +droidsans_fallback_src := DroidSansFallbackFull.ttf +build_droidsans_fallback := true +endif # CONSTRAINED_FONT_FOOTPRINT + +ifeq ($(build_droidsans_fallback),true) include $(CLEAR_VARS) LOCAL_MODULE := DroidSansFallback.ttf -LOCAL_SRC_FILES := $(LOCAL_MODULE) +LOCAL_SRC_FILES := $(droidsans_fallback_src) LOCAL_MODULE_CLASS := ETC LOCAL_MODULE_TAGS := optional LOCAL_MODULE_PATH := $(TARGET_OUT)/fonts include $(BUILD_PREBUILT) droidsans_fallback_src := -endif # SMALLER_FONT_FOOTPRINT +endif # build_droidsans_fallback + +build_droidsans_fallback := ################################ # Build the rest of font files as prebuilt. |