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

Unverified Commit e9e57d84 authored by Tom Marshall's avatar Tom Marshall Committed by Michael Bestas
Browse files

build: Use project pathmap for recovery 

Change-Id: I6339ac77b899a43db21261d587252b65cb58ad79
parent 2953bd88

core/Makefile

+4 −4
Original line number Diff line number Diff line
@@ -872,13 +872,13 @@ ifneq (,$(INSTALLED_RECOVERYIMAGE_TARGET)$(filter true,$(BOARD_USES_RECOVERY_AS_ 
INTERNAL_RECOVERYIMAGE_FILES := $(filter $(TARGET_RECOVERY_OUT)/%, \

    $(ALL_DEFAULT_INSTALLED_MODULES))



recovery_initrc := $(call include-path-for, recovery)/etc/init.rc

recovery_initrc := $(call project-path-for,recovery)/etc/init.rc

recovery_sepolicy := $(call intermediates-dir-for,ETC,sepolicy.recovery)/sepolicy.recovery

recovery_kernel := $(INSTALLED_KERNEL_TARGET) # same as a non-recovery system

recovery_ramdisk := $(PRODUCT_OUT)/ramdisk-recovery.img

recovery_uncompressed_ramdisk := $(PRODUCT_OUT)/ramdisk-recovery.cpio

recovery_build_prop := $(intermediate_system_build_prop)

recovery_resources_common := $(call include-path-for, recovery)/res

recovery_resources_common := $(call project-path-for,recovery)/res



# Set recovery_density to the density bucket of the device.

recovery_density := unknown
@@ -902,9 +902,9 @@ endif 
# its private recovery resources.



ifneq (,$(filter xxxhdpi 560dpi xxhdpi 400dpi xhdpi,$(recovery_density)))

recovery_font := $(call include-path-for, recovery)/fonts/18x32.png

recovery_font := $(call project-path-for,recovery)/fonts/18x32.png

else

recovery_font := $(call include-path-for, recovery)/fonts/12x22.png

recovery_font := $(call project-path-for,recovery)/fonts/12x22.png

endif



ifneq ($(TARGET_RECOVERY_DEVICE_DIRS),)

core/config.mk

+4 −0
Original line number Diff line number Diff line
@@ -167,6 +167,10 @@ include $(BUILD_SYSTEM)/envsetup.mk 
# See envsetup.mk for a description of SCAN_EXCLUDE_DIRS

FIND_LEAVES_EXCLUDES := $(addprefix --prune=, $(OUT_DIR) $(SCAN_EXCLUDE_DIRS) .repo .git)



# General entries for project pathmap.  Any entries listed here should

# be device and hardware independent.

$(call project-set-path-variant,recovery,RECOVERY_VARIANT,bootable/recovery)



-include vendor/extra/BoardConfigExtra.mk



# The build system exposes several variables for where to find the kernel

core/pathmap.mk

+0 −1
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ pathmap_INCL := \ 
    libhardware_legacy:hardware/libhardware_legacy/include \

    libril:hardware/ril/include \

    opengl-tests-includes:frameworks/native/opengl/tests/include \

    recovery:bootable/recovery \

    system-core:system/core/include \

    audio:system/media/audio/include \

    audio-effects:system/media/audio_effects/include \