Merge "Fix ota_from_target_files error in non-AB VF" am: 68f7e845 am: cea047c0

      files package and saves it at this path.

  --rebuild_recovery

      Deprecated; does nothing.

      Copy the recovery image used by non-A/B devices, used when

      regenerating vendor images with --rebuild-sepolicy.

  --allow-duplicate-apkapex-keys

      If provided, duplicate APK/APEX keys are ignored and the value from the

OPTIONS.output_ota = None

OPTIONS.output_img = None

OPTIONS.output_super_empty = None

# TODO(b/132730255): Remove this option.

OPTIONS.rebuild_recovery = False

# TODO(b/150582573): Remove this option.

OPTIONS.allow_duplicate_apkapex_keys = False

def create_merged_package(temp_dir, framework_target_files, framework_item_list,

                          vendor_target_files, vendor_item_list,

                          framework_misc_info_keys, rebuild_recovery,

                          framework_dexpreopt_tools, framework_dexpreopt_config,

                          vendor_dexpreopt_config):

                          framework_misc_info_keys, framework_dexpreopt_tools,

                          framework_dexpreopt_config, vendor_dexpreopt_config):

  """Merges two target files packages into one target files structure.

  Args:

    framework_misc_info_keys: A list of keys to obtain from the framework

      instance of META/misc_info.txt. The remaining keys should come from the

      vendor instance.

    rebuild_recovery: If true, rebuild the recovery patch used by non-A/B

      devices and write it to the system image.

  Args used if dexpreopt is applied:

    framework_dexpreopt_tools: Location of dexpreopt_tools.zip.

    framework_dexpreopt_config: Location of framework's dexpreopt_config.zip.

  Args:

    target_files_dir: Path to merged temp directory.

    rebuild_recovery: If true, rebuild the recovery patch used by non-A/B

      devices and write it to the system image.

      devices and write it to the vendor image.

  """

  # Regenerate IMAGES in the target directory.

      '--verbose',

      '--add_missing',

  ]

  # TODO(b/132730255): Remove this if statement.

  if rebuild_recovery:

    add_img_args.append('--rebuild_recovery')

  add_img_args.append(target_files_dir)

def rebuild_image_with_sepolicy(target_files_dir,

                                rebuild_recovery,

                                vendor_otatools=None,

                                vendor_target_files=None):

  """Rebuilds odm.img or vendor.img to include merged sepolicy files.

  Args:

    target_files_dir: Path to the extracted merged target-files package.

    rebuild_recovery: If true, rebuild the recovery patch used by non-A/B

      devices and use it when regenerating the vendor images.

    vendor_otatools: If not None, path to an otatools.zip from the vendor build

      that is used when recompiling the image.

    vendor_target_files: Expected if vendor_otatools is not None. Path to the

      os.path.join(target_files_dir, 'IMAGES/odm.img')):

    partition = 'odm'

  partition_img = '{}.img'.format(partition)

  partition_map = '{}.map'.format(partition)

  logger.info('Recompiling %s using the merged sepolicy files.', partition_img)

        os.path.join(vendor_otatools_dir, 'bin', 'add_img_to_target_files'),

        '--verbose',

        '--add_missing',

        vendor_target_files_dir,

    ]

    if rebuild_recovery:

      rebuild_partition_command.append('--rebuild_recovery')

    rebuild_partition_command.append(vendor_target_files_dir)

    logger.info('Recompiling %s: %s', partition_img,

                ' '.join(rebuild_partition_command))

    common.RunAndCheckOutput(rebuild_partition_command, verbose=True)

    shutil.move(

        os.path.join(vendor_target_files_dir, 'IMAGES', partition_img),

        os.path.join(target_files_dir, 'IMAGES', partition_img))

    shutil.move(

        os.path.join(vendor_target_files_dir, 'IMAGES', partition_map),

        os.path.join(target_files_dir, 'IMAGES', partition_map))

    def copy_recovery_file(filename):

      for subdir in ('VENDOR', 'SYSTEM/vendor'):

        source = os.path.join(vendor_target_files_dir, subdir, filename)

        if os.path.exists(source):

          dest = os.path.join(target_files_dir, subdir, filename)

          shutil.copy(source, dest)

          return

      logger.info('Skipping copy_recovery_file for %s, file not found',

                  filename)

    if rebuild_recovery:

      copy_recovery_file('etc/recovery.img')

      copy_recovery_file('bin/install-recovery.sh')

def generate_super_empty_image(target_dir, output_super_empty):

    output_super_empty: If provided, creates a super_empty.img file from the

      merged target files package and saves it at this path.

    rebuild_recovery: If true, rebuild the recovery patch used by non-A/B

      devices and write it to the system image.

      devices and use it when regenerating the vendor images.

    vendor_otatools: Path to an otatools zip used for recompiling vendor images.

    rebuild_sepolicy: If true, rebuild odm.img (if target uses ODM) or

      vendor.img using a merged precompiled_sepolicy file.

  output_target_files_temp_dir = create_merged_package(

      temp_dir, framework_target_files, framework_item_list,

      vendor_target_files, vendor_item_list, framework_misc_info_keys,

      rebuild_recovery, framework_dexpreopt_tools, framework_dexpreopt_config,

      framework_dexpreopt_tools, framework_dexpreopt_config,

      vendor_dexpreopt_config)

  if not check_target_files_vintf.CheckVintf(output_target_files_temp_dir):

  common.RunAndCheckOutput(split_sepolicy_cmd)

  # Include the compiled policy in an image if requested.

  if rebuild_sepolicy:

    rebuild_image_with_sepolicy(output_target_files_temp_dir, vendor_otatools,

                                vendor_target_files)

    rebuild_image_with_sepolicy(output_target_files_temp_dir, rebuild_recovery,

                                vendor_otatools, vendor_target_files)

  # Run validation checks on the pre-installed APEX files.

  validate_merged_apex_info(output_target_files_temp_dir, partition_map.keys())

      OPTIONS.output_img = a

    elif o == '--output-super-empty':

      OPTIONS.output_super_empty = a

    elif o == '--rebuild_recovery':  # TODO(b/132730255): Warn

    elif o == '--rebuild_recovery':

      OPTIONS.rebuild_recovery = True

    elif o == '--allow-duplicate-apkapex-keys':

      OPTIONS.allow_duplicate_apkapex_keys = True

  if (args or OPTIONS.framework_target_files is None or

      OPTIONS.vendor_target_files is None or

      (OPTIONS.output_target_files is None and OPTIONS.output_dir is None) or

      (OPTIONS.output_dir is not None and OPTIONS.output_item_list is None)):

      (OPTIONS.output_dir is not None and OPTIONS.output_item_list is None) or

      (OPTIONS.rebuild_recovery and not OPTIONS.rebuild_sepolicy)):

    common.Usage(__doc__)

    sys.exit(1)