diff options
| author | Seigo Nonaka <nona@google.com> | 2018-09-26 22:11:31 -0700 |
|---|---|---|
| committer | Seigo Nonaka <nona@google.com> | 2018-09-28 15:59:15 -0700 |
| commit | 3328d1ce55322f344505173860ebf0525784fb62 (patch) | |
| tree | 74c3c3b4044ee71a2fb863eb1d9e609aebcc9e2c /data/fonts | |
| parent | 914857349e66eb3ce4361c412797319ea0a24386 (diff) | |
Introduce OEM customization XML parser
As the initial version of the OEM customization XML, support
new-named-family customization. This allows OEMs to add new named
family.
Bug: 111544833
Test: atest FrameworksCoreTests:android.graphics
Change-Id: If58711fc038898175fcad0ae095865312bd738e2
Diffstat (limited to 'data/fonts')
| -rw-r--r-- | data/fonts/Android.mk | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/data/fonts/Android.mk b/data/fonts/Android.mk index 76eb4e676923..454dceb9c82c 100644 --- a/data/fonts/Android.mk +++ b/data/fonts/Android.mk @@ -89,23 +89,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := fonts.xml LOCAL_MODULE_CLASS := ETC - -AOSP_FONTS_FILE := frameworks/base/data/fonts/fonts.xml - -ifdef ADDITIONAL_FONTS_FILE -ADDITIONAL_FONTS_SCRIPT := frameworks/base/tools/fonts/add_additional_fonts.py -ADD_ADDITIONAL_FONTS := $(local-generated-sources-dir)/fonts.xml - -$(ADD_ADDITIONAL_FONTS): PRIVATE_SCRIPT := $(ADDITIONAL_FONTS_SCRIPT) -$(ADD_ADDITIONAL_FONTS): PRIVATE_ADDITIONAL_FONTS_FILE := $(ADDITIONAL_FONTS_FILE) -$(ADD_ADDITIONAL_FONTS): $(ADDITIONAL_FONTS_SCRIPT) $(AOSP_FONTS_FILE) $(ADDITIONAL_FONTS_FILE) - rm -f $@ - python $(PRIVATE_SCRIPT) $@ $(PRIVATE_ADDITIONAL_FONTS_FILE) -else -ADD_ADDITIONAL_FONTS := $(AOSP_FONTS_FILE) -endif - -LOCAL_PREBUILT_MODULE_FILE := $(ADD_ADDITIONAL_FONTS) +LOCAL_PREBUILT_MODULE_FILE := frameworks/base/data/fonts/fonts.xml include $(BUILD_PREBUILT) |