openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge "Revert "Integrate build_font.py"" into lmp-preview-dev

This commit is contained in:
Erik Pasternak 2014-06-08 20:12:41 +00:00 committed by Android (Google) Code Review
parent 8723f9e212 21cf439581
commit e1d76eed32
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/Makefile
View File

@ -1588,10 +1588,6 @@ $(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
@ -1607,9 +1603,6 @@ $(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 \
@ -1625,7 +1618,6 @@ $(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 && \