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

Commit 353928d2 authored by Ankit Goyal's avatar Ankit Goyal Committed by Automerger Merge Worker
Browse files

Merge "Revert "Add prebuilt bootloader var and add bootloader to img zip"" am:... 

Merge "Revert "Add prebuilt bootloader var and add bootloader to img zip"" am: 3c94b271 am: 5b26b37a am: 1811209e

Original change: https://android-review.googlesource.com/c/platform/build/+/1411607

Change-Id: Iac564bbc3fc6de32f72d2501e604a17493a33923
parents 44ac72f1 1811209e

core/Makefile

+0 −12
Original line number Diff line number Diff line
@@ -584,10 +584,6 @@ ALL_DEFAULT_INSTALLED_MODULES += $(event_log_tags_file) 
# #################################################################

ifneq ($(strip $(TARGET_NO_BOOTLOADER)),true)

  INSTALLED_BOOTLOADER_MODULE := $(PRODUCT_OUT)/bootloader

  ifdef BOARD_PREBUILT_BOOTLOADER

    $(eval $(call copy-one-file,$(BOARD_PREBUILT_BOOTLOADER),$(INSTALLED_BOOTLOADER_MODULE)))

    $(call dist-for-goals,dist_files,$(INSTALLED_BOOTLOADER_MODULE))

  endif # BOARD_PREBUILT_BOOTLOADER

  ifeq ($(strip $(TARGET_BOOTLOADER_IS_2ND)),true)

    INSTALLED_2NDBOOTLOADER_TARGET := $(PRODUCT_OUT)/2ndbootloader

  else
@@ -4162,9 +4158,6 @@ endif 
ifdef DEVICE_MANIFEST_FILE

	$(hide) echo "vintf_include_empty_vendor_sku=true" >> $@

endif

ifeq ($(BOARD_BOOTLOADER_IN_UPDATE_PACKAGE),true)

	$(hide) echo "bootloader_in_update_package=true" >> $@

endif



.PHONY: misc_info

misc_info: $(INSTALLED_MISC_INFO_TARGET)
@@ -4344,7 +4337,6 @@ $(BUILT_TARGET_FILES_PACKAGE): \ 
	    $(INSTALLED_ANDROID_INFO_TXT_TARGET) \

	    $(INSTALLED_KERNEL_TARGET) \

	    $(INSTALLED_DTBIMAGE_TARGET) \

	    $(INSTALLED_BOOTLOADER_MODULE) \

	    $(INSTALLED_2NDBOOTLOADER_TARGET) \

	    $(BOARD_PREBUILT_DTBOIMAGE) \

	    $(BOARD_PREBUILT_RECOVERY_DTBOIMAGE) \
@@ -4615,10 +4607,6 @@ 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 BOARD_PREBUILT_BOOTLOADER

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

	$(hide) cp $(INSTALLED_BOOTLOADER_MODULE) $(zip_root)/IMAGES/

endif

ifneq ($(strip $(BOARD_CUSTOMIMAGES_PARTITION_LIST)),)

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

	$(hide) $(foreach partition,$(BOARD_CUSTOMIMAGES_PARTITION_LIST), \

core/board_config.mk

+0 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ 
# ###############################################################



_board_strip_readonly_list := \

  BOARD_BOOTLOADER_IN_UPDATE_PACKAGE \

  BOARD_EGL_CFG \

  BOARD_HAVE_BLUETOOTH \

  BOARD_INSTALLER_CMDLINE \

tools/releasetools/img_from_target_files.py

+2 −6
Original line number Diff line number Diff line
@@ -58,7 +58,6 @@ OPTIONS = common.OPTIONS 
OPTIONS.additional_entries = []

OPTIONS.bootable_only = False

OPTIONS.put_super = None

OPTIONS.put_bootloader = None

OPTIONS.dynamic_partition_list = None

OPTIONS.super_device_list = None

OPTIONS.retrofit_dap = None
@@ -76,7 +75,6 @@ def LoadOptions(input_file): 
    info = OPTIONS.info_dict = common.LoadInfoDict(input_zip)



  OPTIONS.put_super = info.get('super_image_in_update_package') == 'true'

  OPTIONS.put_bootloader = info.get('bootloader_in_update_package') == 'true'

  OPTIONS.dynamic_partition_list = info.get('dynamic_partition_list',

                                            '').strip().split()

  OPTIONS.super_device_list = info.get('super_block_devices',
@@ -124,11 +122,9 @@ def EntriesForUserImages(input_file): 


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

    image = os.path.basename(image_path)

    if OPTIONS.bootable_only and image not in('boot.img', 'recovery.img', 'bootloader'):

    if OPTIONS.bootable_only and image not in ('boot.img', 'recovery.img'):

      continue

    if not image.endswith('.img') and image != 'bootloader':

      continue

    if image == 'bootloader' and not OPTIONS.put_bootloader:

    if not image.endswith('.img'):

      continue

    # Filter out super_empty and the images that are already in super partition.

    if OPTIONS.put_super: