diff options
| author | Doug Zongker <dougz@android.com> | 2013-03-07 22:34:00 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-03-07 22:34:00 +0000 |
| commit | 07e9fbb2418e394cc719ed840fff9986577f45f1 (patch) | |
| tree | 244c355f31910fefbea80291987a8961d7e7165d /core | |
| parent | 49ffc52074abe5521e0dd2597206a890020cdf73 (diff) | |
| parent | e12973258af50248118f6f0bd86b29810c9e2dd3 (diff) | |
| download | build-07e9fbb2418e394cc719ed840fff9986577f45f1.zip build-07e9fbb2418e394cc719ed840fff9986577f45f1.tar.gz build-07e9fbb2418e394cc719ed840fff9986577f45f1.tar.bz2 | |
Merge "recovery: choose between available fonts based on device density" into jb-mr2-dev
Diffstat (limited to 'core')
| -rw-r--r-- | core/Makefile | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/core/Makefile b/core/Makefile index 2f86fd7..1e94c60 100644 --- a/core/Makefile +++ b/core/Makefile @@ -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), \ |