From 3942072885ec2f46bcffea96fc569a2d57173614 Mon Sep 17 00:00:00 2001 From: Tom Marshall Date: Tue, 28 Oct 2014 16:12:15 -0700 Subject: [PATCH] build: recovery: Support adding device-specific items Change-Id: I25205e68282680932917016646dabd1abadbfce6 --- core/Makefile | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/core/Makefile b/core/Makefile index b20cfe6e56..90ff0bc379 100644 --- a/core/Makefile +++ b/core/Makefile @@ -2622,6 +2622,16 @@ RECOVERY_WIPE_DATA_CONFIRMATION_TEXT_FILE := RECOVERY_WIPE_DATA_MENU_HEADER_TEXT_FILE := endif # TARGET_RECOVERY_UI_SCREEN_WIDTH +ifneq ($(TARGET_RECOVERY_DEVICE_DIRS),) +recovery_root_private := $(strip \ + $(foreach d,$(TARGET_RECOVERY_DEVICE_DIRS), $(wildcard $(d)/recovery/root))) +else +recovery_root_private := $(strip $(wildcard $(TARGET_DEVICE_DIR)/recovery/root)) +endif +ifneq ($(recovery_root_private),) +recovery_root_deps := $(shell find $(recovery_root_private) -type f) +endif + ifndef TARGET_PRIVATE_RES_DIRS TARGET_PRIVATE_RES_DIRS := $(wildcard $(TARGET_DEVICE_DIR)/recovery/res) endif @@ -2782,7 +2792,7 @@ $(INTERNAL_RECOVERY_RAMDISK_FILES_TIMESTAMP): $(MKBOOTFS) $(COMPRESSION_COMMAND_ $(INSTALLED_2NDBOOTLOADER_TARGET) \ $(INSTALLED_RECOVERY_BUILD_PROP_TARGET) \ $(INSTALLED_RECOVERY_RAMDISK_BUILD_PROP_TARGET) \ - $(recovery_resource_deps) \ + $(recovery_resource_deps) $(recovery_root_deps) \ $(recovery_fstab) # Making recovery image mkdir -p $(TARGET_RECOVERY_OUT) @@ -2801,6 +2811,8 @@ $(INTERNAL_RECOVERY_RAMDISK_FILES_TIMESTAMP): $(MKBOOTFS) $(COMPRESSION_COMMAND_ $(foreach recovery_text_file,$(generated_recovery_text_files), \ cp -rf $(recovery_text_file) $(TARGET_RECOVERY_ROOT_OUT)/res/images/ &&) true cp -f $(recovery_font) $(TARGET_RECOVERY_ROOT_OUT)/res/images/font.png + $(foreach item,$(recovery_root_private), \ + cp -rf $(item) $(TARGET_RECOVERY_OUT)/) $(foreach item,$(TARGET_PRIVATE_RES_DIRS), \ cp -rf $(item) $(TARGET_RECOVERY_ROOT_OUT)/$(newline)) $(foreach item,$(recovery_fstab), \