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

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

Merge "Add 16K artifacts to PREBUILT_IMAGES/ dir of target_files"

parents 08b97147 decee4ad

core/Makefile

+10 −0
Original line number Diff line number Diff line
@@ -6001,6 +6001,8 @@ $(BUILT_TARGET_FILES_DIR): \ 
	    $(INSTALLED_RAMDISK_TARGET) \

	    $(INSTALLED_DTBIMAGE_TARGET) \

	    $(INSTALLED_2NDBOOTLOADER_TARGET) \

	    $(BUILT_RAMDISK_16K_TARGET) \

	    $(BUILT_KERNEL_16K_TARGET) \

	    $(BOARD_PREBUILT_DTBOIMAGE) \

	    $(BOARD_PREBUILT_RECOVERY_DTBOIMAGE) \

	    $(BOARD_RECOVERY_ACPIO) \
@@ -6344,6 +6346,14 @@ ifdef BOARD_PREBUILT_DTBOIMAGE 
	$(hide) mkdir -p $(zip_root)/PREBUILT_IMAGES

	$(hide) cp $(INSTALLED_DTBOIMAGE_TARGET) $(zip_root)/PREBUILT_IMAGES/

endif # BOARD_PREBUILT_DTBOIMAGE

ifdef BUILT_KERNEL_16K_TARGET

	$(hide) mkdir -p $(zip_root)/PREBUILT_IMAGES

	$(hide) cp $(BUILT_KERNEL_16K_TARGET) $(zip_root)/PREBUILT_IMAGES/

endif # BUILT_KERNEL_16K_TARGET

ifdef BUILT_RAMDISK_16K_TARGET

	$(hide) mkdir -p $(zip_root)/PREBUILT_IMAGES

	$(hide) cp $(BUILT_RAMDISK_16K_TARGET) $(zip_root)/PREBUILT_IMAGES/

endif # BUILT_RAMDISK_16K_TARGET

ifeq ($(BOARD_USES_PVMFWIMAGE),true)

	$(hide) mkdir -p $(zip_root)/PREBUILT_IMAGES

	$(hide) cp $(INSTALLED_PVMFWIMAGE_TARGET) $(zip_root)/PREBUILT_IMAGES/

tools/releasetools/img_from_target_files.py

+7 −3
Original line number Diff line number Diff line
@@ -122,6 +122,10 @@ def EntriesForUserImages(input_file): 
  ]

  with zipfile.ZipFile(input_file) as input_zip:

    namelist = input_zip.namelist()

  if 'PREBUILT_IMAGES/kernel_16k' in namelist:

    entries.append('PREBUILT_IMAGES/kernel_16k:kernel_16k')

  if 'PREBUILT_IMAGES/ramdisk_16k.img' in namelist:

    entries.append('PREBUILT_IMAGES/ramdisk_16k.img:ramdisk_16k.img')



  for image_path in [name for name in namelist if name.startswith('IMAGES/')]:

    image = os.path.basename(image_path)