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

Commit f54216f2 authored by Tao Bao's avatar Tao Bao
Browse files

Pack base_fs files into target_files.zip. 

Pack the base_fs files ({system,vendor}.map) into target_files.zip,
which would be needed when rebuilding the images at signing.

Reset the base_fs paths to point to the files in META/.

Also add blk_alloc_to_base_fs into otatools.zip.

Bug: 27698960
Change-Id: If4eb274b3f3d839c4365624f46f0dc89bd2fa440
parent 5eee82cf

core/Makefile

+10 −1
Original line number Diff line number Diff line
@@ -1501,7 +1501,8 @@ OTATOOLS := $(HOST_OUT_EXECUTABLES)/minigzip \ 
  $(HOST_OUT_EXECUTABLES)/fec \

  $(HOST_OUT_EXECUTABLES)/brillo_update_payload \

  $(HOST_OUT_EXECUTABLES)/lib/shflags/shflags \

  $(HOST_OUT_EXECUTABLES)/delta_generator

  $(HOST_OUT_EXECUTABLES)/delta_generator \

  $(BLK_ALLOC_TO_BASE_FS)



# Shared libraries.

OTATOOLS += \
@@ -1754,6 +1755,14 @@ ifneq ($(OEM_THUMBPRINT_PROPERTIES),) 
	# OTA scripts are only interested in fingerprint related properties

	$(hide) echo "oem_fingerprint_properties=$(OEM_THUMBPRINT_PROPERTIES)" >> $(zip_root)/META/misc_info.txt

endif

ifneq ($(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SYSTEM_BASE_FS_PATH),)

	$(hide) $(ACP) $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SYSTEM_BASE_FS_PATH) \

	  $(zip_root)/META/$(notdir $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SYSTEM_BASE_FS_PATH))

endif

ifneq ($(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VENDOR_BASE_FS_PATH),)

	$(hide) $(ACP) $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VENDOR_BASE_FS_PATH) \

	  $(zip_root)/META/$(notdir $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VENDOR_BASE_FS_PATH))

endif

ifneq ($(strip $(SANITIZE_TARGET)),)

	# We need to create userdata.img with real data because the instrumented libraries are in userdata.img.

	$(hide) echo "userdata_img_with_data=true" >> $(zip_root)/META/misc_info.txt

tools/releasetools/common.py

+15 −0
Original line number Diff line number Diff line
@@ -182,6 +182,21 @@ def LoadInfoDict(input_file, input_dir=None): 
      d["ramdisk_fs_config"] = os.path.join(

          input_dir, "META", "root_filesystem_config.txt")



    # Redirect {system,vendor}_base_fs_file.

    if "system_base_fs_file" in d:

      basename = os.path.basename(d["system_base_fs_file"])

      system_base_fs_file = os.path.join(input_dir, "META", basename)

      assert os.path.exists(system_base_fs_file), \

          "failed to find system base fs file: %s" % (system_base_fs_file,)

      d["system_base_fs_file"] = system_base_fs_file



    if "vendor_base_fs_file" in d:

      basename = os.path.basename(d["vendor_base_fs_file"])

      vendor_base_fs_file = os.path.join(input_dir, "META", basename)

      assert os.path.exists(vendor_base_fs_file), \

          "failed to find vendor base fs file: %s" % (vendor_base_fs_file,)

      d["vendor_base_fs_file"] = vendor_base_fs_file



  try:

    data = read_helper("META/imagesizes.txt")

    for line in data.split("\n"):