diff options
| author | Brint E. Kriebel <bekit@cyngn.com> | 2014-11-18 13:41:00 -0800 |
|---|---|---|
| committer | Brint E. Kriebel <bekit@cyngn.com> | 2014-11-18 13:41:00 -0800 |
| commit | 0106bd1fa17596bd35c3fdb7e82952690982682e (patch) | |
| tree | 68a6931150b2e45baf53ca824803732ecfbbdeec | |
| parent | caee911a4858dbdfed66cc40f030b28c217ccd2f (diff) | |
| parent | d559aacd7d2b4e6dc162f3d8489a00a9bd92f23a (diff) | |
| download | replicant_build-cm-11.0-XNPH05Q-bacon-5229c4ef56.zip replicant_build-cm-11.0-XNPH05Q-bacon-5229c4ef56.tar.gz replicant_build-cm-11.0-XNPH05Q-bacon-5229c4ef56.tar.bz2 | |
Merge branch 'cm-11.0' into stable/cm-11.0cm-11.0-XNPH05Q-tomato-9828f8e9cccm-11.0-XNPH05Q-bacon-5229c4ef56
| -rw-r--r-- | core/Makefile | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/core/Makefile b/core/Makefile index 76c1b5e..312a3c1 100644 --- a/core/Makefile +++ b/core/Makefile @@ -694,7 +694,12 @@ recovery_binary := $(call intermediates-dir-for,EXECUTABLES,recovery)/recovery recovery_resources_common := $(call project-path-for,recovery)/res recovery_resources_extra := $(call project-path-for,recovery)/res-$(TARGET_RECOVERY_SCREEN_WIDTH) recovery_resources_private := $(strip $(wildcard $(TARGET_DEVICE_DIR)/recovery/res)) +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 recovery_resource_deps := $(shell find $(recovery_resources_common) $(recovery_resources_extra) \ $(recovery_resources_private) $(recovery_root_private) -type f) ifneq ($(TARGET_RECOVERY_FSTAB),) |