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

Commit babdafe9 authored by David Iserovich's avatar David Iserovich
Browse files

[config] Dist supports custom super image script 

Some boards need to supply a custom super image script, and this
is supported via the BOARD_CUSTOM_BUILD_SUPER_IMAGE variable.

However, this variable is not used by img_from_target_files.py.

Change img_from_target_files.py to call the supplied script.

Bug: None
Change-Id: I6bca937534f58459d3419139ee7a37a10138ab8f
parent 908aba11

core/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -7118,6 +7118,7 @@ $(INTERNAL_UPDATE_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE) $(IMG_FROM_TARG 
	PATH=$(INTERNAL_USERIMAGES_BINARY_PATHS):$(dir $(ZIP2ZIP)):$$PATH \

	    $(IMG_FROM_TARGET_FILES) \

	        --additional IMAGES/VerifiedBootParams.textproto:VerifiedBootParams.textproto \

	        --build_super_image $(BUILD_SUPER_IMAGE) \

	        $(BUILT_TARGET_FILES_PACKAGE) $@



$(call declare-1p-container,$(INTERNAL_UPDATE_PACKAGE_TARGET),)

tools/releasetools/img_from_target_files.py

+11 −1
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ OPTIONS.retrofit_dap = None 
OPTIONS.build_super = None

OPTIONS.sparse_userimages = None

OPTIONS.use_fastboot_info = False

OPTIONS.build_super_image = None



def LoadOptions(input_file):

  """Loads information from input_file to OPTIONS.
@@ -174,6 +175,12 @@ def RebuildAndWriteSuperImages(input_file, output_file): 
  input_tmp = common.UnzipTemp(input_file)



  super_file = common.MakeTempFile('super_', '.img')



  # Allow overriding the BUILD_SUPER_IMAGE binary

  if OPTIONS.build_super_image:

    command = [OPTIONS.build_super_image, input_tmp, super_file]

    common.RunAndCheckOutput(command)

  else:

    BuildSuperImage(input_tmp, super_file)



  logger.info('Writing super.img to archive...')
@@ -231,6 +238,8 @@ def main(argv): 
      OPTIONS.bootable_only = True

    elif o == '--additional':

      OPTIONS.additional_entries.append(a)

    elif o == '--build_super_image':

      OPTIONS.build_super_image = a

    else:

      return False

    return True
@@ -240,6 +249,7 @@ def main(argv): 
                             extra_long_opts=[

                                 'additional=',

                                 'bootable_zip',

                                 'build_super_image=',

                             ],

                             extra_option_handler=option_handler)

  if len(args) != 2: