Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bdcdd4fc authored by Deepanshu Gupta's avatar Deepanshu Gupta Committed by Android Git Automerger
Browse files

am 7a864ea1: Update font list for the SDK 

* commit '7a864ea1':
  Update font list for the SDK
parents 77b8ba58 7a864ea1

core/Makefile

+3 −25
Original line number Diff line number Diff line
@@ -1643,28 +1643,7 @@ else 
sdk_atree_files += $(atree_dir)/sdk.atree

endif



# For fonts to be bundled with the SDK. We copy them from the output of the device build.

# They are also processed by the following script to edit their PS Names.

sdk_font_rename_script := frameworks/base/tools/layoutlib/rename_font/build_font_single.py

fonttools_lib := external/fonttools/Lib

sdk_font_temp_dir := $(call intermediates-dir-for,PACKAGING,sdk-fonts)

sdk_fonts := $(filter $(TARGET_OUT)/fonts/%tf, $(INTERNAL_SYSTEMIMAGE_FILES))

sdk_fonts := $(addprefix $(sdk_font_temp_dir)/, $(notdir $(sdk_fonts)))

sdk_font_config := $(wildcard frameworks/base/data/fonts/*.xml)

sdk_font_config :=  $(addprefix $(sdk_font_temp_dir)/, $(notdir $(sdk_font_config)))



# Files ending in 'tf' - .ttf or .otf. This excludes .xml files

$(sdk_fonts): $(sdk_font_temp_dir)/%tf: $(TARGET_OUT)/fonts/%tf \

			$(sdk_font_rename_script)

	$(hide) mkdir -p $(dir $@)

	$(hide) PYTHONPATH=$$PYTHONPATH:$(fonttools_lib) $(sdk_font_rename_script) \

	    $< $@



# Files ending in 'xml'

$(sdk_font_config): $(sdk_font_temp_dir)/%.xml: \

			frameworks/base/data/fonts/%.xml

	$(hide) mkdir -p $(dir $@)

	$(hide) cp -vf $< $@

include $(BUILD_SYSTEM)/sdk_font.mk



deps := \

	$(target_notice_file_txt) \
@@ -1680,8 +1659,7 @@ deps := \ 
	$(sdk_atree_files) \

	$(HOST_OUT_EXECUTABLES)/atree \

	$(HOST_OUT_EXECUTABLES)/line_endings \

	$(sdk_fonts) \

	$(sdk_font_config)

	$(SDK_FONT_DEPS)



INTERNAL_SDK_TARGET := $(sdk_dir)/$(sdk_name).zip

$(INTERNAL_SDK_TARGET): PRIVATE_NAME := $(sdk_name)
@@ -1719,7 +1697,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)" \

			-v "FONT_OUT=$(SDK_FONT_TEMP)" \

			-o $(PRIVATE_DIR) && \

		cp -f $(target_notice_file_txt) \

				$(PRIVATE_DIR)/system-images/android-$(PLATFORM_VERSION)/$(TARGET_CPU_ABI)/NOTICE.txt && \

core/sdk_font.mk

0 → 100644
+61 −0
Original line number Diff line number Diff line 
###############################################################################

# Fonts shipped with the SDK need to be renamed for Java to handle them

# properly. Hence, a special script is used to rename the fonts. We bundle all

# the fonts that are shipped on a newer non-space-constrained device. However,

# OpenType fonts used on these devices are not supported by Java. Their

# replacements are added separately.

###############################################################################





# The script that renames the font.

sdk_font_rename_script := frameworks/base/tools/layoutlib/rename_font/build_font_single.py



# Location of the fonttools library that the above script depends on.

fonttools_lib := external/fonttools/Lib



# A temporary location to store the renamed fonts. atree picks all files in

# this directory and bundles it with the SDK.

SDK_FONT_TEMP := $(call intermediates-dir-for,PACKAGING,sdk-fonts,HOST,COMMON)



# The font configuration files - system_fonts.xml, fallback_fonts.xml etc.

sdk_font_config := $(wildcard frameworks/base/data/fonts/*.xml)

sdk_font_config :=  $(addprefix $(SDK_FONT_TEMP)/, $(notdir $(sdk_font_config)))



$(sdk_font_config): $(SDK_FONT_TEMP)/%.xml: \

			frameworks/base/data/fonts/%.xml

	$(hide) mkdir -p $(dir $@)

	$(hide) cp -vf $< $@



# List of fonts on the device that we want to ship. This is all .ttf fonts.

sdk_fonts_device := $(filter $(TARGET_OUT)/fonts/%.ttf, $(INTERNAL_SYSTEMIMAGE_FILES))

sdk_fonts_device := $(addprefix $(SDK_FONT_TEMP)/, $(notdir $(sdk_fonts_device)))



# Macro to rename the font.

sdk_rename_font = PYTHONPATH=$$PYTHONPATH:$(fonttools_lib) $(sdk_font_rename_script) \

	    $1 $2



# TODO: If the font file is a symlink, reuse the font renamed from the symlink

# target.

$(sdk_fonts_device): $(SDK_FONT_TEMP)/%.ttf: $(TARGET_OUT)/fonts/%.ttf \

			$(sdk_font_rename_script)

	$(hide) mkdir -p $(dir $@)

	$(hide) $(call sdk_rename_font,$<,$@)



# Extra fonts that are not part of the device build. These are used as a

# replacement for the OpenType fonts.

sdk_fonts_extra := NanumGothic.ttf DroidSansFallback.ttf

sdk_fonts_extra := $(addprefix $(SDK_FONT_TEMP)/, $(sdk_fonts_extra))



$(SDK_FONT_TEMP)/NanumGothic.ttf: external/naver-fonts/NanumGothic.ttf \

			$(sdk_font_rename_script)

	$(hide) mkdir -p $(dir $@)

	$(hide) $(call sdk_rename_font,$<,$@)



$(SDK_FONT_TEMP)/DroidSansFallback.ttf: frameworks/base/data/fonts/DroidSansFallbackFull.ttf \

			$(sdk_font_rename_script)

	$(hide) mkdir -p $(dir $@)

	$(hide) $(call sdk_rename_font,$<,$@)



# List of all dependencies - all fonts and configuration files.

SDK_FONT_DEPS := $(sdk_fonts_device) $(sdk_fonts_extra) $(sdk_font_config)