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

Commit e66e7c19 authored by Alistair Strachan's avatar Alistair Strachan Committed by android-build-merger
Browse files

Merge "Add misc_info.txt to rebuild super.img" am: 95836d71 am: c0e3153e am: 126c86e5 

am: d88599fa

Change-Id: I5613e4f4d57aa2d8dd119861833889990bf5826a
parents dddcd4c9 d88599fa

core/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -4434,6 +4434,7 @@ ifneq (true,$(PRODUCT_RETROFIT_DYNAMIC_PARTITIONS)) 


# For real devices and for dist builds, build super image from target files to an intermediate directory.

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

INTERNAL_SUPERIMAGE_MISC_INFO := $(call intermediates-dir-for,PACKAGING,superimage_debug)/misc_info.txt

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

$(INTERNAL_SUPERIMAGE_DIST_TARGET): $(LPMAKE) $(BUILT_TARGET_FILES_PACKAGE) $(BUILD_SUPER_IMAGE)

	$(call pretty,"Target super fs image from target files: $@")
@@ -4485,7 +4486,7 @@ ifeq (true,$(BOARD_BUILD_SUPER_IMAGE_BY_DEFAULT)) 
$(INSTALLED_SUPERIMAGE_TARGET): $(INSTALLED_SUPERIMAGE_DEPENDENCIES)

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

	$(call build-superimage-target,$(INSTALLED_SUPERIMAGE_TARGET),\

	  $(call intermediates-dir-for,PACKAGING,superimage_debug)/misc_info.txt)

	  $(INTERNAL_SUPERIMAGE_MISC_INFO))



droidcore: $(INSTALLED_SUPERIMAGE_TARGET)
@@ -4559,6 +4560,7 @@ $(INTERNAL_UPDATE_PACKAGE_TARGET): $(INTERNAL_SUPERIMAGE_DIST_TARGET) 
	    $(foreach device,$(BOARD_SUPER_PARTITION_BLOCK_DEVICES), \

	      OTA/super_$(device).img:super_$(device).img)) \

	  OTA/android-info.txt:android-info.txt "IMAGES/*.img:."

	$(if $(INTERNAL_SUPERIMAGE_MISC_INFO), zip -q -j -u $@ $(INTERNAL_SUPERIMAGE_MISC_INFO))

	$(if $(INTERNAL_SUPERIMAGE_DIST_TARGET), zip -q -j -u $@ $(INTERNAL_SUPERIMAGE_DIST_TARGET))

else

$(INTERNAL_UPDATE_PACKAGE_TARGET):