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

Commit 4e5e42b7 authored by Isaac Chen's avatar Isaac Chen
Browse files

Add misc_info.txt to rebuild super.img 

Include misc_info.txt (of CF's super.img) in *-img-*.zip.
This is needed if we want to rebuild super.img by replacing
some partitions in it.

Other tools, lpunpack and lpmake, are included in CF's
host package in another CL.

Bug: 134461288
Test: $ lunch aosp_cf_x86-userdebug
      $ m dist
      $ unzip -l $OUT/*-img-*.zip | grep misc_info
            619  2019-05-27 17:42   misc_info.txt

Change-Id: Idf6146c2a7f9f32c9c4e5ddd2f6b9e65fc6bf55b
parent f4a8b641

core/Makefile

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




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

# 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_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): extracted_input_target_files := $(patsubst %.zip,%,$(BUILT_TARGET_FILES_PACKAGE))

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

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

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

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

$(INSTALLED_SUPERIMAGE_TARGET): $(INSTALLED_SUPERIMAGE_DEPENDENCIES)

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

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

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

	$(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)

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

	    $(foreach device,$(BOARD_SUPER_PARTITION_BLOCK_DEVICES), \

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

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

	  OTA/android-info.txt:android-info.txt "IMAGES/*.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))

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

else

else

$(INTERNAL_UPDATE_PACKAGE_TARGET):

$(INTERNAL_UPDATE_PACKAGE_TARGET):