diff options
| author | Roozbeh Pournader <roozbeh@google.com> | 2015-08-05 03:16:35 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-05 03:16:35 +0000 |
| commit | 815a6b6bdf400413057c83fa0ee63db749785d85 (patch) | |
| tree | 8f9d2750580d4ab76cddb18ad5178d6866ac4f3c | |
| parent | 3832b13c1fe316be416bacb1f1badc5e67f44b4e (diff) | |
| parent | 519adb50ebd45b8ecd1a8b8abbb975e35bb42974 (diff) | |
| download | frameworks_base-815a6b6bdf400413057c83fa0ee63db749785d85.zip frameworks_base-815a6b6bdf400413057c83fa0ee63db749785d85.tar.gz frameworks_base-815a6b6bdf400413057c83fa0ee63db749785d85.tar.bz2 | |
am 519adb50: Merge "Create a special CONSTRAINED font bucket in frameworks." into mnc-dev
* commit '519adb50ebd45b8ecd1a8b8abbb975e35bb42974':
Create a special CONSTRAINED font bucket in frameworks.
| -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 3181017..39458f9 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. |