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

Commit f753e157 authored by Bill Peckham's avatar Bill Peckham
Browse files

Include merge_target_files.py deps in otatools.zip, use common argv processing. 

The merge_target_files.py script needs fc_sort and sefcontext_compile, so
include these tools into otatools.zip via core/Makefile.

Modify tools/releasetools/merge_target_files.py to use the otatools common argv
processing to take advantage of the '--path' option so that we add point the
'--path' option to an extracted otatools.zip package to gain access to fc_sort,
sefcontext_compile, and soong_zip (previously included in otatools.zip).

Bug: 123600124
Test: extract otatools.zip, use --path option to point to it, verify result
Change-Id: I7d84525981b8741c6bdbcac9984256920fc7f417
parent 7ccf993d

core/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -3417,6 +3417,8 @@ OTATOOLS := $(HOST_OUT_EXECUTABLES)/minigzip \ 
  $(HOST_OUT_EXECUTABLES)/lib/shflags/shflags \

  $(HOST_OUT_EXECUTABLES)/delta_generator \

  $(HOST_OUT_EXECUTABLES)/care_map_generator \

  $(HOST_OUT_EXECUTABLES)/fc_sort \

  $(HOST_OUT_EXECUTABLES)/sefcontext_compile \

  $(LPMAKE) \

  $(AVBTOOL) \

  $(BLK_ALLOC_TO_BASE_FS) \

tools/releasetools/merge_target_files.py

+38 −31
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ Usage: merge_target_files.py [args] 


from __future__ import print_function



import argparse

import fnmatch

import logging

import os
@@ -48,6 +47,10 @@ import add_img_to_target_files 
logger = logging.getLogger(__name__)

OPTIONS = common.OPTIONS

OPTIONS.verbose = True

OPTIONS.system_target_files = None

OPTIONS.other_target_files = None

OPTIONS.output_target_files = None

OPTIONS.keep_tmp = False



# system_extract_as_is_item_list is a list of items to extract from the partial

# system target files package as is, meaning these items will land in the
@@ -561,8 +564,7 @@ def merge_target_files( 
    f.write(other_content)



  command = [

      # TODO(124468071): Use soong_zip from otatools.zip

      'prebuilts/build-tools/linux-x86/bin/soong_zip',

      'soong_zip',

      '-d',

      '-o', output_zip,

      '-C', output_target_files_temp_dir,
@@ -643,36 +645,41 @@ def main(): 


  common.InitLogging()



  parser = argparse.ArgumentParser()



  parser.add_argument(

      '--system-target-files',

      required=True,

      help='The input target files package containing system bits.')



  parser.add_argument(

      '--other-target-files',

      required=True,

      help='The input target files package containing other bits.')



  parser.add_argument(

      '--output-target-files',

      required=True,

      help='The output merged target files package.')



  parser.add_argument(

      '--keep-tmp',

      required=False,

      action='store_true',

      help='Keep the temporary directories after execution.')



  args = parser.parse_args()

  def option_handler(o, a):

    if o == '--system-target-files':

      OPTIONS.system_target_files = a

    elif o == '--other-target-files':

      OPTIONS.other_target_files = a

    elif o == '--output-target-files':

      OPTIONS.output_target_files = a

    elif o == '--keep_tmp':

      OPTIONS.keep_tmp = True

    else:

      return False

    return True



  args = common.ParseOptions(

      sys.argv[1:], __doc__,

      extra_long_opts=[

          'system-target-files=',

          'other-target-files=',

          'output-target-files=',

          "keep_tmp",

      ],

      extra_option_handler=option_handler)



  if (len(args) != 0 or 

      OPTIONS.system_target_files is None or

      OPTIONS.other_target_files is None or

      OPTIONS.output_target_files is None):

    common.Usage(__doc__)

    return 1



  return merge_target_files_with_temp_dir(

      system_target_files=args.system_target_files,

      other_target_files=args.other_target_files,

      output_target_files=args.output_target_files,

      keep_tmp=args.keep_tmp)

      system_target_files=OPTIONS.system_target_files,

      other_target_files=OPTIONS.other_target_files,

      output_target_files=OPTIONS.output_target_files,

      keep_tmp=OPTIONS.keep_tmp)





if __name__ == '__main__':