tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

am 887cd0c7: Integrate build_font.py again

Browse source 
* commit '887cd0c71e756d295f6879e6b3f34753b9d67ce8':
  Integrate build_font.py again
This commit is contained in:
Deepanshu Gupta 2014-06-12 16:54:20 +00:00 committed by Android Git Automerger
commit 04d0f5f3ab
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
core/Makefile
View file

@ -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_DEP_FILE := $(sdk_dep_file)
$(INTERNAL_SDK_TARGET): PRIVATE_INPUT_FILES := $(sdk_atree_files) $(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. # Set SDK_GNU_ERROR to non-empty to fail when a GNU target is built.
# #
#SDK_GNU_ERROR := true #SDK_GNU_ERROR := true
@ -1606,6 +1610,9 @@ $(INTERNAL_SDK_TARGET): $(deps)
fi; \ fi; \
done; \ done; \
if [ $$FAIL ]; then exit 1; fi 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) ( \ $(hide) ( \
ATREE_STRIP="strip -x" \ ATREE_STRIP="strip -x" \
$(HOST_OUT_EXECUTABLES)/atree \ $(HOST_OUT_EXECUTABLES)/atree \
@ -1621,6 +1628,7 @@ $(INTERNAL_SDK_TARGET): $(deps)
-v "TARGET_ARCH=$(TARGET_ARCH)" \ -v "TARGET_ARCH=$(TARGET_ARCH)" \
-v "TARGET_CPU_ABI=$(TARGET_CPU_ABI)" \ -v "TARGET_CPU_ABI=$(TARGET_CPU_ABI)" \
-v "DLL_EXTENSION=$(HOST_SHLIB_SUFFIX)" \ -v "DLL_EXTENSION=$(HOST_SHLIB_SUFFIX)" \
-v "FONT_OUT=$(sdk_font_temp_dir)" \
-o $(PRIVATE_DIR) && \ -o $(PRIVATE_DIR) && \
cp -f $(target_notice_file_txt) \ cp -f $(target_notice_file_txt) \
$(PRIVATE_DIR)/system-images/android-$(PLATFORM_VERSION)/$(TARGET_CPU_ABI)/NOTICE.txt && \ $(PRIVATE_DIR)/system-images/android-$(PLATFORM_VERSION)/$(TARGET_CPU_ABI)/NOTICE.txt && \