StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am a1655645: am edf7bf8d: Merge "Allow custom recovery resource dirs."

Browse Source 
* commit 'a16556450c53c18d49fa55ad2a5f08880f997e04':
  Allow custom recovery resource dirs.
This commit is contained in:
Ying Wang
2015-08-10 22:27:01 +00:00
committed by Android Git Automerger
parent 070961e6f2 a16556450c
commit fd50d4dec3
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/Makefile
View File

@@ -806,9 +806,11 @@ else
recovery_font := $(call include-path-for, recovery)/fonts/12x22.png recovery_font := $(call include-path-for, recovery)/fonts/12x22.png
endif endif
recovery_resources_private := $(strip $(wildcard $(TARGET_DEVICE_DIR)/recovery/res)) ifndef TARGET_PRIVATE_RES_DIRS
TARGET_PRIVATE_RES_DIRS := $(wildcard $(TARGET_DEVICE_DIR)/recovery/res)
endif
recovery_resource_deps := $(shell find $(recovery_resources_common) \ recovery_resource_deps := $(shell find $(recovery_resources_common) \
$(recovery_resources_private) -type f) $(TARGET_PRIVATE_RES_DIRS) -type f)
ifdef TARGET_RECOVERY_FSTAB ifdef TARGET_RECOVERY_FSTAB
recovery_fstab := $(TARGET_RECOVERY_FSTAB) recovery_fstab := $(TARGET_RECOVERY_FSTAB)
else else
@@ -824,7 +826,7 @@ else
RECOVERY_RESOURCE_ZIP := RECOVERY_RESOURCE_ZIP :=
endif endif
ifeq ($(recovery_resources_private),) ifeq ($(TARGET_PRIVATE_RES_DIRS),)
$(info No private recovery resources for TARGET_DEVICE $(TARGET_DEVICE)) $(info No private recovery resources for TARGET_DEVICE $(TARGET_DEVICE))
endif endif
@@ -885,8 +887,8 @@ define build-recoveryimage-target
$(hide) rm -rf $(TARGET_RECOVERY_ROOT_OUT)/res/* $(hide) rm -rf $(TARGET_RECOVERY_ROOT_OUT)/res/*
$(hide) cp -rf $(recovery_resources_common)/* $(TARGET_RECOVERY_ROOT_OUT)/res $(hide) cp -rf $(recovery_resources_common)/* $(TARGET_RECOVERY_ROOT_OUT)/res
$(hide) cp -f $(recovery_font) $(TARGET_RECOVERY_ROOT_OUT)/res/images/font.png $(hide) cp -f $(recovery_font) $(TARGET_RECOVERY_ROOT_OUT)/res/images/font.png
$(hide) $(foreach item,$(recovery_resources_private), \ $(hide) $(foreach item,$(TARGET_PRIVATE_RES_DIRS), \
cp -rf $(item) $(TARGET_RECOVERY_ROOT_OUT)/) cp -rf $(item) $(TARGET_RECOVERY_ROOT_OUT)/$(newline))
$(hide) $(foreach item,$(recovery_fstab), \ $(hide) $(foreach item,$(recovery_fstab), \
cp -f $(item) $(TARGET_RECOVERY_ROOT_OUT)/etc/recovery.fstab) cp -f $(item) $(TARGET_RECOVERY_ROOT_OUT)/etc/recovery.fstab)
$(hide) cp $(RECOVERY_INSTALL_OTA_KEYS) $(TARGET_RECOVERY_ROOT_OUT)/res/keys $(hide) cp $(RECOVERY_INSTALL_OTA_KEYS) $(TARGET_RECOVERY_ROOT_OUT)/res/keys