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

Commit 07e9fbb2 authored by Doug Zongker's avatar Doug Zongker Committed by Android (Google) Code Review
Browse files

Merge "recovery: choose between available fonts based on device density" into jb-mr2-dev

parents 49ffc520 e1297325

core/Makefile

+12 −0
Original line number Diff line number Diff line
@@ -608,6 +608,17 @@ recovery_ramdisk := $(PRODUCT_OUT)/ramdisk-recovery.img 
recovery_build_prop := $(INSTALLED_BUILD_PROP_TARGET)

recovery_binary := $(call intermediates-dir-for,EXECUTABLES,recovery)/recovery

recovery_resources_common := $(call include-path-for, recovery)/res



# Select the 18x32 font on high-density devices; and the 12x22 font on

# other devices.  Note that the font selected here can be overridden

# for a particular device by putting a font.png in its private

# recovery resources.

ifneq (,$(filter xxhdpi xhdpi,$(subst $(comma),$(space),$(PRODUCT_AAPT_CONFIG))))

recovery_font := $(call include-path-for, recovery)/fonts/18x32.png

else

recovery_font := $(call include-path-for, recovery)/fonts/12x22.png

endif



recovery_resources_private := $(strip $(wildcard $(TARGET_DEVICE_DIR)/recovery/res))

recovery_resource_deps := $(shell find $(recovery_resources_common) \

  $(recovery_resources_private) -type f)
@@ -683,6 +694,7 @@ $(INSTALLED_RECOVERYIMAGE_TARGET): $(MKBOOTFS) $(MKBOOTIMG) $(MINIGZIP) \ 
	$(hide) -cp $(TARGET_ROOT_OUT)/init.recovery.*.rc $(TARGET_RECOVERY_ROOT_OUT)/

	$(hide) cp -f $(recovery_binary) $(TARGET_RECOVERY_ROOT_OUT)/sbin/

	$(hide) cp -rf $(recovery_resources_common) $(TARGET_RECOVERY_ROOT_OUT)/

	$(hide) cp -f $(recovery_font) $(TARGET_RECOVERY_ROOT_OUT)/res/images/font.png

	$(hide) $(foreach item,$(recovery_resources_private), \

	  cp -rf $(item) $(TARGET_RECOVERY_ROOT_OUT)/)

	$(hide) $(foreach item,$(recovery_fstab), \