diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2014-06-18 00:25:30 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-18 00:25:30 +0000 |
| commit | 849cf47483e6ba01b65a90b532800f4fc32fe809 (patch) | |
| tree | 271e158e78720d1b81443ffd8dd58b3de0f6f385 /core/Makefile | |
| parent | a44f9a35a284c600616a7f2213a861ecdefd5615 (diff) | |
| parent | aaa502bc9ee796c4121cc275834f083b85b4e71e (diff) | |
| download | build-849cf47483e6ba01b65a90b532800f4fc32fe809.zip build-849cf47483e6ba01b65a90b532800f4fc32fe809.tar.gz build-849cf47483e6ba01b65a90b532800f4fc32fe809.tar.bz2 | |
am aaa502bc: am e662adf7: am 2a7f1c59: Merge "Integrate build_font.py [DO NOT MERGE]" into klp-dev
* commit 'aaa502bc9ee796c4121cc275834f083b85b4e71e':
Integrate build_font.py [DO NOT MERGE]
Diffstat (limited to 'core/Makefile')
| -rw-r--r-- | core/Makefile | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/core/Makefile b/core/Makefile index 596c3c5..2f60cac 100644 --- a/core/Makefile +++ b/core/Makefile @@ -1542,6 +1542,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 +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 @@ -1557,6 +1561,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 \ @@ -1572,6 +1579,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 && \ |