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

Commit c2fe9162 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Move super.img to obj/PACKAGING"

parents a719f021 5478754c

CleanSpec.mk

+2 −0
Original line number Diff line number Diff line
@@ -613,6 +613,8 @@ $(call add-clean-step, rm -rf $(HOST_OUT)/framework/vts-tradefed.jar) 


# Clean up old location of system_other.avbpubkey

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/etc/security/avb/)



$(call add-clean-step, rm -rf $(PRODUCT_OUT)/super.img)

# ************************************************

# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

# ************************************************

core/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -4427,7 +4427,7 @@ define dump-super-image-info 
endef



ifneq (true,$(PRODUCT_RETROFIT_DYNAMIC_PARTITIONS))

INSTALLED_SUPERIMAGE_TARGET := $(PRODUCT_OUT)/super.img

INSTALLED_SUPERIMAGE_TARGET := $(call intermediates-dir-for,PACKAGING,super.img)/super.img

$(INSTALLED_SUPERIMAGE_TARGET): extracted_input_target_files := $(patsubst %.zip,%,$(BUILT_TARGET_FILES_PACKAGE))

$(INSTALLED_SUPERIMAGE_TARGET): $(LPMAKE) $(BUILT_TARGET_FILES_PACKAGE) $(BUILD_SUPER_IMAGE)

	$(call pretty,"Target super fs image: $@")