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

Commit fa89475e authored by Tom Marshall's avatar Tom Marshall
Browse files

build: Use project pathmap for recovery 

Change-Id: I6339ac77b899a43db21261d587252b65cb58ad79
parent 22913dea

core/Makefile

+4 −4
Original line number Diff line number Diff line
@@ -779,14 +779,14 @@ ifeq (,$(filter true, $(TARGET_NO_KERNEL) $(TARGET_NO_RECOVERY))) 


INSTALLED_RECOVERYIMAGE_TARGET := $(PRODUCT_OUT)/recovery.img



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 := $(INSTALLED_BUILD_PROP_TARGET)

recovery_binary := $(call intermediates-dir-for,EXECUTABLES,recovery)/recovery

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
@@ -814,9 +814,9 @@ endif 
# its private recovery resources.



ifneq (,$(filter xxxhdpi xxhdpi 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
@@ -150,6 +150,10 @@ endif 
# are specific to the user's build configuration.

include $(BUILD_SYSTEM)/envsetup.mk



# 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

# headers:

core/pathmap.mk

+0 −1
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ pathmap_INCL := \ 
    libstdc++:bionic/libstdc++/include \

    mkbootimg:system/core/mkbootimg \

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

    recovery:bootable/recovery \

    system-core:system/core/include \

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

    audio-utils:system/media/audio_utils/include \