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

Commit 0106bd1f authored by Brint E. Kriebel's avatar Brint E. Kriebel
Browse files

Merge branch 'cm-11.0' into stable/cm-11.0

parents caee911a d559aacd

core/Makefile

+5 −0
Original line number Diff line number Diff line
@@ -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),)