am c91b67ad: am 31a536e1: am 57928364: am 53c38c88: Merge "Revert "Create a... (0f3ac894) · Commits · e / os / android_frameworks_base

data/fonts/Android.mk

+4 −20

Original line number	Original line	Diff line number	Diff line
	@@ -17,13 +17,10 @@

	LOCAL_PATH := $(call my-dir)		LOCAL_PATH := $(call my-dir)

	# Use full Noto Sans Japanese font on the normal footprints, but		# Use full Noto Sans Japanese font on non-smaller footprints
	# exclude it from SMALLER and use a subset on the CONSTRAINED ones.
	ifneq ($(SMALLER_FONT_FOOTPRINT),true)		ifneq ($(SMALLER_FONT_FOOTPRINT),true)
	ifneq ($(CONSTRAINED_FONT_FOOTPRINT),true)
	FONT_NOTOSANS_JP_FULL := true		FONT_NOTOSANS_JP_FULL := true
	endif		endif
	endif

	##########################################		##########################################
	# create symlink for given font		# create symlink for given font
	@@ -85,32 +82,19 @@ include $(BUILD_PREBUILT)
	extra_font_files :=		extra_font_files :=

	################################		################################
	# Include the DroidSansFallback subset on SMALLER_FONT_FOOTPRINT builds,		# Include the DroidSansFallback subset on SMALLER_FONT_FOOTPRINT build
	# and the full font on CONSTRAINED_FONT_FOOTPRINT ones.
	ifeq ($(SMALLER_FONT_FOOTPRINT),true)		ifeq ($(SMALLER_FONT_FOOTPRINT),true)
	droidsans_fallback_src := DroidSansFallback.ttf
	build_droidsans_fallback := true
	endif # SMALLER_FONT_FOOTPRINT

	ifeq ($(CONSTRAINED_FONT_FOOTPRINT),true)
	droidsans_fallback_src := DroidSansFallbackFull.ttf
	build_droidsans_fallback := true
	endif # CONSTRAINED_FONT_FOOTPRINT

	ifeq ($(build_droidsans_fallback),true)

	include $(CLEAR_VARS)		include $(CLEAR_VARS)
	LOCAL_MODULE := DroidSansFallback.ttf		LOCAL_MODULE := DroidSansFallback.ttf
	LOCAL_SRC_FILES := $(droidsans_fallback_src)		LOCAL_SRC_FILES := $(LOCAL_MODULE)
	LOCAL_MODULE_CLASS := ETC		LOCAL_MODULE_CLASS := ETC
	LOCAL_MODULE_TAGS := optional		LOCAL_MODULE_TAGS := optional
	LOCAL_MODULE_PATH := $(TARGET_OUT)/fonts		LOCAL_MODULE_PATH := $(TARGET_OUT)/fonts
	include $(BUILD_PREBUILT)		include $(BUILD_PREBUILT)
	droidsans_fallback_src :=		droidsans_fallback_src :=

	endif # build_droidsans_fallback		endif # SMALLER_FONT_FOOTPRINT

	build_droidsans_fallback :=

	################################		################################
	# Build the rest of font files as prebuilt.		# Build the rest of font files as prebuilt.