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

Commit 7a8ffbeb authored by Yifan Hong's avatar Yifan Hong
Browse files

resolve merge conflicts of 7bd8a369 to master 

Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I16278376fb4a2b26f15b675016d00819ea99c296
parents 8859e60f 7bd8a369

CleanSpec.mk

+2 −0
Original line number Diff line number Diff line
@@ -617,6 +617,8 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/etc/security/avb/) 
# Clean up bufferhub files

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/bin/hw/android.frameworks.bufferhub@1.0-service)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/etc/init/android.frameworks.bufferhub@1.0-service.rc)



$(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
@@ -4426,7 +4426,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: $@")