diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2014-08-10 22:48:29 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-10 19:43:29 +0000 |
| commit | ec02094d3ebda1db9da9fc9aec792249cbdc5217 (patch) | |
| tree | 2db225cdc8176522b2827c73da1260f49a11da95 /core/Makefile | |
| parent | 3930fbdd7c19c3680a76563ffe6dc36d86b892cf (diff) | |
| parent | 4e5e5825222dc5f3608a4b8a61c0ff46f0cdcece (diff) | |
| download | build-ec02094d3ebda1db9da9fc9aec792249cbdc5217.zip build-ec02094d3ebda1db9da9fc9aec792249cbdc5217.tar.gz build-ec02094d3ebda1db9da9fc9aec792249cbdc5217.tar.bz2 | |
Merge "Use fonts from generic device for the SDK." into lmp-dev
Diffstat (limited to 'core/Makefile')
| -rw-r--r-- | core/Makefile | 34 |
1 files changed, 26 insertions, 8 deletions
diff --git a/core/Makefile b/core/Makefile index ba893ee..fea5349 100644 --- a/core/Makefile +++ b/core/Makefile @@ -1643,6 +1643,29 @@ else sdk_atree_files += $(atree_dir)/sdk.atree endif +# For fonts to be bundled with the SDK. We copy them from the output of the device build. +# They are also processed by the following script to edit their PS Names. +sdk_font_rename_script := frameworks/base/tools/layoutlib/rename_font/build_font_single.py +fonttools_lib := external/fonttools/Lib +sdk_font_temp_dir := $(call intermediates-dir-for,PACKAGING,sdk-fonts) +sdk_fonts := $(filter $(TARGET_OUT)/fonts/%tf, $(INTERNAL_SYSTEMIMAGE_FILES)) +sdk_fonts := $(addprefix $(sdk_font_temp_dir)/, $(notdir $(sdk_fonts))) +sdk_font_config := $(wildcard frameworks/base/data/fonts/*.xml) +sdk_font_config := $(addprefix $(sdk_font_temp_dir)/, $(notdir $(sdk_font_config))) + +# Files ending in 'tf' - .ttf or .otf. This excludes .xml files +$(sdk_fonts): $(sdk_font_temp_dir)/%tf: $(TARGET_OUT)/fonts/%tf \ + $(sdk_font_rename_script) + $(hide) mkdir -p $(dir $@) + $(hide) PYTHONPATH=$$PYTHONPATH:$(fonttools_lib) $(sdk_font_rename_script) \ + $< $@ + +# Files ending in 'xml' +$(sdk_font_config): $(sdk_font_temp_dir)/%.xml: \ + frameworks/base/data/fonts/%.xml + $(hide) mkdir -p $(dir $@) + $(hide) cp -vf $< $@ + deps := \ $(target_notice_file_txt) \ $(tools_notice_file_txt) \ @@ -1656,7 +1679,9 @@ deps := \ $(ATREE_FILES) \ $(sdk_atree_files) \ $(HOST_OUT_EXECUTABLES)/atree \ - $(HOST_OUT_EXECUTABLES)/line_endings + $(HOST_OUT_EXECUTABLES)/line_endings \ + $(sdk_fonts) \ + $(sdk_font_config) INTERNAL_SDK_TARGET := $(sdk_dir)/$(sdk_name).zip $(INTERNAL_SDK_TARGET): PRIVATE_NAME := $(sdk_name) @@ -1664,10 +1689,6 @@ $(INTERNAL_SDK_TARGET): PRIVATE_DIR := $(sdk_dir)/$(sdk_name) $(INTERNAL_SDK_TARGET): PRIVATE_DEP_FILE := $(sdk_dep_file) $(INTERNAL_SDK_TARGET): PRIVATE_INPUT_FILES := $(sdk_atree_files) -sdk_font_temp_dir := $(call intermediates-dir-for,PACKAGING,sdk-fonts) -sdk_font_input_list := frameworks/base/data/fonts external/noto-fonts external/google-fonts external/naver-fonts -sdk_font_rename_script := frameworks/base/tools/layoutlib/rename_font/build_font.py - # Set SDK_GNU_ERROR to non-empty to fail when a GNU target is built. # #SDK_GNU_ERROR := true @@ -1683,9 +1704,6 @@ $(INTERNAL_SDK_TARGET): $(deps) fi; \ done; \ if [ $$FAIL ]; then exit 1; fi - $(hide) mkdir -p $(sdk_font_temp_dir) - $(hide) PYTHONPATH=$$PYTHONPATH:external/fonttools/Lib $(sdk_font_rename_script) $(sdk_font_input_list) \ - $(sdk_font_temp_dir) $(hide) ( \ ATREE_STRIP="strip -x" \ $(HOST_OUT_EXECUTABLES)/atree \ |