StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Add prebuilt bootloader var and add bootloader to img zip"

Browse Source 
Revert submission 1402265-cf-x86-bootloader

Reason for revert: Droidcop-triggered revert due to breakage https://android-build.googleplex.com/builds/quarterdeck?branch=git_master&target=adt3-userdebug&lkgb=6791187&lkbb=6791249&fkbb=6791216, bug 166380489
Reverted Changes:
Id67b7bddd:Add prebuilt bootloader var and add bootloader to ...
Id713eaf20:Added bootloader binary to cf x86 based targets

Change-Id: I89e95d4a6a0534c8217785be9b90632fa110bc41
This commit is contained in:
Ankit Goyal
2020-08-26 06:40:59 +00:00
parent 41a03d3aee
commit 6805873751
3 changed files with 2 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/Makefile
View File

@@ -584,10 +584,6 @@ ALL_DEFAULT_INSTALLED_MODULES += $(event_log_tags_file)
# ################################################################# # #################################################################
ifneq ($(strip $(TARGET_NO_BOOTLOADER)),true) ifneq ($(strip $(TARGET_NO_BOOTLOADER)),true)
INSTALLED_BOOTLOADER_MODULE := $(PRODUCT_OUT)/bootloader 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) ifeq ($(strip $(TARGET_BOOTLOADER_IS_2ND)),true)
INSTALLED_2NDBOOTLOADER_TARGET := $(PRODUCT_OUT)/2ndbootloader INSTALLED_2NDBOOTLOADER_TARGET := $(PRODUCT_OUT)/2ndbootloader
else else
@@ -4142,9 +4138,6 @@ endif
ifdef DEVICE_MANIFEST_FILE ifdef DEVICE_MANIFEST_FILE
$(hide) echo "vintf_include_empty_vendor_sku=true" >> $@ $(hide) echo "vintf_include_empty_vendor_sku=true" >> $@
endif endif
ifeq ($(BOARD_BOOTLOADER_IN_UPDATE_PACKAGE),true)
$(hide) echo "bootloader_in_update_package=true" >> $@
endif
.PHONY: misc_info .PHONY: misc_info
misc_info: $(INSTALLED_MISC_INFO_TARGET) misc_info: $(INSTALLED_MISC_INFO_TARGET)
@@ -4324,7 +4317,6 @@ $(BUILT_TARGET_FILES_PACKAGE): \
$(INSTALLED_ANDROID_INFO_TXT_TARGET) \ $(INSTALLED_ANDROID_INFO_TXT_TARGET) \
$(INSTALLED_KERNEL_TARGET) \ $(INSTALLED_KERNEL_TARGET) \
$(INSTALLED_DTBIMAGE_TARGET) \ $(INSTALLED_DTBIMAGE_TARGET) \
$(INSTALLED_BOOTLOADER_MODULE) \
$(INSTALLED_2NDBOOTLOADER_TARGET) \ $(INSTALLED_2NDBOOTLOADER_TARGET) \
$(BOARD_PREBUILT_DTBOIMAGE) \ $(BOARD_PREBUILT_DTBOIMAGE) \
$(BOARD_PREBUILT_RECOVERY_DTBOIMAGE) \ $(BOARD_PREBUILT_RECOVERY_DTBOIMAGE) \
@@ -4591,10 +4583,6 @@ ifdef BOARD_PREBUILT_DTBOIMAGE
$(hide) mkdir -p $(zip_root)/PREBUILT_IMAGES $(hide) mkdir -p $(zip_root)/PREBUILT_IMAGES
$(hide) cp $(INSTALLED_DTBOIMAGE_TARGET) $(zip_root)/PREBUILT_IMAGES/ $(hide) cp $(INSTALLED_DTBOIMAGE_TARGET) $(zip_root)/PREBUILT_IMAGES/
endif # BOARD_PREBUILT_DTBOIMAGE 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)),) ifneq ($(strip $(BOARD_CUSTOMIMAGES_PARTITION_LIST)),)
$(hide) mkdir -p $(zip_root)/PREBUILT_IMAGES $(hide) mkdir -p $(zip_root)/PREBUILT_IMAGES
$(hide) $(foreach partition,$(BOARD_CUSTOMIMAGES_PARTITION_LIST), \ $(hide) $(foreach partition,$(BOARD_CUSTOMIMAGES_PARTITION_LIST), \

1
core/board_config.mk
View File

@@ -20,7 +20,6 @@
# ############################################################### # ###############################################################
_board_strip_readonly_list := \ _board_strip_readonly_list := \
BOARD_BOOTLOADER_IN_UPDATE_PACKAGE \
BOARD_EGL_CFG \ BOARD_EGL_CFG \
BOARD_HAVE_BLUETOOTH \ BOARD_HAVE_BLUETOOTH \
BOARD_INSTALLER_CMDLINE \ BOARD_INSTALLER_CMDLINE \

8
tools/releasetools/img_from_target_files.py
View File

@@ -58,7 +58,6 @@ OPTIONS = common.OPTIONS
OPTIONS.additional_entries = [] OPTIONS.additional_entries = []
OPTIONS.bootable_only = False OPTIONS.bootable_only = False
OPTIONS.put_super = None OPTIONS.put_super = None
OPTIONS.put_bootloader = None
OPTIONS.dynamic_partition_list = None OPTIONS.dynamic_partition_list = None
OPTIONS.super_device_list = None OPTIONS.super_device_list = None
OPTIONS.retrofit_dap = None OPTIONS.retrofit_dap = None
@@ -76,7 +75,6 @@ def LoadOptions(input_file):
info = OPTIONS.info_dict = common.LoadInfoDict(input_zip) info = OPTIONS.info_dict = common.LoadInfoDict(input_zip)
OPTIONS.put_super = info.get('super_image_in_update_package') == 'true' 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', OPTIONS.dynamic_partition_list = info.get('dynamic_partition_list',
'').strip().split() '').strip().split()
OPTIONS.super_device_list = info.get('super_block_devices', 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/')]: for image_path in [name for name in namelist if name.startswith('IMAGES/')]:
image = os.path.basename(image_path) 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 continue
if not image.endswith('.img') and image != 'bootloader': if not image.endswith('.img'):
continue
if image == 'bootloader' and not OPTIONS.put_bootloader:
continue continue
# Filter out super_empty and the images that are already in super partition. # Filter out super_empty and the images that are already in super partition.
if OPTIONS.put_super: if OPTIONS.put_super: