From 21cf43958141e2ddf7c2adfd17aae978d1156bb7 Mon Sep 17 00:00:00 2001 From: Erik Pasternak Date: Sun, 8 Jun 2014 19:31:01 +0000 Subject: [PATCH] Revert "Integrate build_font.py" This CL broke the SDK builds. This reverts commit 9eebd78f6ef844aec2401db5e3b69d08aec227a7. Change-Id: I973b40688602461bd3b0f8c1e1beb53b9fbec83c --- core/Makefile | 8 -------- 1 file changed, 8 deletions(-) diff --git a/core/Makefile b/core/Makefile index a6d189bd6c..9e10417bf2 100644 --- a/core/Makefile +++ b/core/Makefile @@ -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_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 @@ -1607,9 +1603,6 @@ $(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 \ @@ -1625,7 +1618,6 @@ $(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 && \