diff options
| author | 2024-07-08 09:17:32 -0700 | |
|---|---|---|
| committer | 2024-07-08 09:17:32 -0700 | |
| commit | 23a97cd73f21a6204e4e8af09b95a6b356950f07 (patch) | |
| tree | dcca453726f00aaf5961576dac78bad35c0587ca | |
| parent | 1ef79a4dad856fd74a5a722b789c04f8e089a06a (diff) | |
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
| -rw-r--r-- | core/Makefile | 57 |
1 files changed, 29 insertions, 28 deletions
diff --git a/core/Makefile b/core/Makefile index 18e35c1624..506f01495c 100644 --- a/core/Makefile +++ b/core/Makefile @@ -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)) @@ -1166,34 +1195,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 INSTALLED_DTBOIMAGE_16KB_TARGET := $(PRODUCT_OUT)/dtbo_16k.img |