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

Commit 23a97cd7 authored by Kelvin Zhang's avatar Kelvin Zhang
Browse files

Move DTBO target definition outside of BUILDING_RAMDISK_IMAGE guard 

DTBO taget definition is unintionally moved inside
ifdef BUILDING_RAMDISK_IMAGE guard by aosp/3150938 . This causes
some targets to miss dtbo building if they don't define a ramdisk.

Test: th
Bug: 350056336
Change-Id: If840cc57af794b7844593eeed5935f5e10567e3f
parent 1ef79a4d

core/Makefile

+29 −28
Original line number Diff line number Diff line
@@ -1052,6 +1052,35 @@ $(INSTALLED_DTBIMAGE_TARGET) : $(sort $(wildcard $(BOARD_PREBUILT_DTBIMAGE_DIR)/ 
endif

endif





# -----------------------------------------------------------------

# dtbo image

ifdef BOARD_PREBUILT_DTBOIMAGE

INSTALLED_DTBOIMAGE_TARGET := $(PRODUCT_OUT)/dtbo.img



ifeq ($(BOARD_AVB_ENABLE),true)

$(INSTALLED_DTBOIMAGE_TARGET): $(BOARD_PREBUILT_DTBOIMAGE) $(AVBTOOL) $(BOARD_AVB_DTBO_KEY_PATH)

	cp $(BOARD_PREBUILT_DTBOIMAGE) $@

	chmod +w $@

	$(AVBTOOL) add_hash_footer \

	    --image $@ \

	    $(call get-partition-size-argument,$(BOARD_DTBOIMG_PARTITION_SIZE)) \

	    --partition_name dtbo $(INTERNAL_AVB_DTBO_SIGNING_ARGS) \

	    $(BOARD_AVB_DTBO_ADD_HASH_FOOTER_ARGS)



$(call declare-1p-container,$(INSTALLED_DTBOIMAGE_TARGET),)

$(call declare-container-license-deps,$(INSTALLED_DTBOIMAGE_TARGET),$(BOARD_PREBUILT_DTBOIMAGE),$(PRODUCT_OUT)/:/)



UNMOUNTED_NOTICE_VENDOR_DEPS+= $(INSTALLED_DTBOIMAGE_TARGET)

else

$(INSTALLED_DTBOIMAGE_TARGET): $(BOARD_PREBUILT_DTBOIMAGE)

	cp $(BOARD_PREBUILT_DTBOIMAGE) $@

endif



endif # BOARD_PREBUILT_DTBOIMAGE



# -----------------------------------------------------------------



# -----------------------------------------------------------------

# the ramdisk

INSTALLED_FILES_OUTSIDE_IMAGES := $(filter-out $(TARGET_RAMDISK_OUT)/%, $(INSTALLED_FILES_OUTSIDE_IMAGES))
@@ -1165,34 +1194,6 @@ ramdisk_16k: $(BUILT_RAMDISK_16K_TARGET) 


endif



# -----------------------------------------------------------------

# dtbo image

ifdef BOARD_PREBUILT_DTBOIMAGE

INSTALLED_DTBOIMAGE_TARGET := $(PRODUCT_OUT)/dtbo.img



ifeq ($(BOARD_AVB_ENABLE),true)

$(INSTALLED_DTBOIMAGE_TARGET): $(BOARD_PREBUILT_DTBOIMAGE) $(AVBTOOL) $(BOARD_AVB_DTBO_KEY_PATH)

	cp $(BOARD_PREBUILT_DTBOIMAGE) $@

	chmod +w $@

	$(AVBTOOL) add_hash_footer \

	    --image $@ \

	    $(call get-partition-size-argument,$(BOARD_DTBOIMG_PARTITION_SIZE)) \

	    --partition_name dtbo $(INTERNAL_AVB_DTBO_SIGNING_ARGS) \

	    $(BOARD_AVB_DTBO_ADD_HASH_FOOTER_ARGS)



$(call declare-1p-container,$(INSTALLED_DTBOIMAGE_TARGET),)

$(call declare-container-license-deps,$(INSTALLED_DTBOIMAGE_TARGET),$(BOARD_PREBUILT_DTBOIMAGE),$(PRODUCT_OUT)/:/)



UNMOUNTED_NOTICE_VENDOR_DEPS+= $(INSTALLED_DTBOIMAGE_TARGET)

else

$(INSTALLED_DTBOIMAGE_TARGET): $(BOARD_PREBUILT_DTBOIMAGE)

	cp $(BOARD_PREBUILT_DTBOIMAGE) $@

endif



endif # BOARD_PREBUILT_DTBOIMAGE



# -----------------------------------------------------------------



# -----------------------------------------------------------------

# 16KB dtbo image

ifdef BOARD_PREBUILT_DTBOIMAGE_16KB