From daee78227c9156704cce134f62f3e88416728652 Mon Sep 17 00:00:00 2001 From: Deepanshu Gupta Date: Tue, 27 May 2014 18:07:49 -0700 Subject: [PATCH] Integrate build_font.py [DO NOT MERGE] Execute the build_font.py script to rename the PS name of the fonts to be shipped with the SDK. Also edited the list of font directories to include in the build. Change-Id: I023fb0dfcf50698f80e26b7d476969c453fc4cc7 (cherry picked from commit 354ed641ebd66279d136f055d3878ceb01a5bb73) --- core/Makefile | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/core/Makefile b/core/Makefile index 299fbf82fc..a7227b1e01 100644 --- a/core/Makefile +++ b/core/Makefile @@ -1539,6 +1539,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 +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 @@ -1554,6 +1558,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 \ @@ -1569,6 +1576,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 && \