diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2014-06-12 16:54:20 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-12 16:54:20 +0000 |
| commit | 04d0f5f3ab844b1d6f14ff67398384faff54ed5b (patch) | |
| tree | aed76633dee114aa10769be70a9792594684c1c1 | |
| parent | fa3aebf76285da0275be52a2254013dfd53b0e19 (diff) | |
| parent | 887cd0c71e756d295f6879e6b3f34753b9d67ce8 (diff) | |
| download | build-04d0f5f3ab844b1d6f14ff67398384faff54ed5b.zip build-04d0f5f3ab844b1d6f14ff67398384faff54ed5b.tar.gz build-04d0f5f3ab844b1d6f14ff67398384faff54ed5b.tar.bz2 | |
am 887cd0c7: Integrate build_font.py again
* commit '887cd0c71e756d295f6879e6b3f34753b9d67ce8':
Integrate build_font.py again
| -rw-r--r-- | core/Makefile | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/core/Makefile b/core/Makefile index 6f17164..bd194f0 100644 --- a/core/Makefile +++ b/core/Makefile @@ -1591,6 +1591,10 @@ $(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 @@ -1606,6 +1610,9 @@ $(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 \ @@ -1621,6 +1628,7 @@ $(INTERNAL_SDK_TARGET): $(deps) -v "TARGET_ARCH=$(TARGET_ARCH)" \ -v "TARGET_CPU_ABI=$(TARGET_CPU_ABI)" \ -v "DLL_EXTENSION=$(HOST_SHLIB_SUFFIX)" \ + -v "FONT_OUT=$(sdk_font_temp_dir)" \ -o $(PRIVATE_DIR) && \ cp -f $(target_notice_file_txt) \ $(PRIVATE_DIR)/system-images/android-$(PLATFORM_VERSION)/$(TARGET_CPU_ABI)/NOTICE.txt && \ |