diff options
| author | Andrew Sapperstein <asapperstein@google.com> | 2017-05-18 16:37:22 -0700 |
|---|---|---|
| committer | Andrew Sapperstein <asapperstein@google.com> | 2017-05-30 16:49:14 -0700 |
| commit | 7459bc49b043e0770b6bda090b2b2e6a6326e2ab (patch) | |
| tree | dd379231c6d98d6b4bee36be58866595ea61ba6c /data/fonts | |
| parent | f9e9fa440a8e684ca0b10e591927e1019c371e71 (diff) | |
Create fonts.xml module for adding fonts.xml to system/etc
Previously, we used PRODUCT_COPY_FILES. However, that does not allow
overriding the file to use a different one on a per-device basis.
This change migrates the logic to using a BUILD_PREBUILT module
called fonts.xml.
To add additional fonts, the add_additional_fonts.py script has been
added. If ADDITIONAL_FONTS_FILE is defined, add_additional_fonts.py
is run and generates a new version of fonts.xml that contains the
content of ADDITIONAL_FONTS_FILE added where
"<!-- fallback fonts -->" is added.
Bug: 36855735
Bug: 37997769
Test: manual. built multiple devices and verified that the correct
versions of fonts.xml were showing.
Change-Id: I8308f0cb3068274bca5ebd25a38cc023babbd69d
Diffstat (limited to 'data/fonts')
| -rw-r--r-- | data/fonts/Android.mk | 27 | ||||
| -rw-r--r-- | data/fonts/fonts.mk | 6 |
2 files changed, 29 insertions, 4 deletions
diff --git a/data/fonts/Android.mk b/data/fonts/Android.mk index 5baa75b8aac3..7b2fa76f01df 100644 --- a/data/fonts/Android.mk +++ b/data/fonts/Android.mk @@ -81,6 +81,33 @@ $(foreach f, $(font_src_files), $(call build-one-font-module, $(f))) build-one-font-module := font_src_files := +################################ +# Copies the font configuration file into system/etc for the product as fonts.xml. +# In the case where $(ADDITIONAL_FONTS_FILE) is defined, the content of $(ADDITIONAL_FONTS_FILE) +# is added to the $(AOSP_FONTS_FILE). +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) + +include $(BUILD_PREBUILT) # Run sanity tests on fonts on checkbuild checkbuild: fontchain_lint diff --git a/data/fonts/fonts.mk b/data/fonts/fonts.mk index 23c54aec62fe..e884f2fe4bbb 100644 --- a/data/fonts/fonts.mk +++ b/data/fonts/fonts.mk @@ -14,9 +14,7 @@ # Warning: this is actually a product definition, to be inherited from -PRODUCT_COPY_FILES := \ - frameworks/base/data/fonts/fonts.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/fonts.xml - PRODUCT_PACKAGES := \ DroidSansMono.ttf \ - AndroidClock.ttf + AndroidClock.ttf \ + fonts.xml |