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

Commit b426df33 authored by Daniel Norman's avatar Daniel Norman Committed by Automerger Merge Worker
Browse files

Merge "Adjust some behaviors for --rebuild-sepolicy" am: e62232d7 

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

Change-Id: I4d1eafe114c1c64a5278a600b142e4f90382be21
parents f4494732 e62232d7

tools/releasetools/merge_target_files.py

+12 −2
Original line number Diff line number Diff line
@@ -1000,8 +1000,15 @@ def rebuild_image_with_sepolicy(target_files_dir, 
  # Copy the combined SEPolicy file and framework hashes to the image that is

  # being rebuilt.

  def copy_selinux_file(input_path, output_filename):

    input_filename = os.path.join(target_files_dir, input_path)

    if not os.path.exists(input_filename):

      input_filename = input_filename.replace('SYSTEM_EXT/', 'SYSTEM/system_ext/') \

          .replace('PRODUCT/', 'SYSTEM/product/')

      if not os.path.exists(input_filename):

        logger.info('Skipping copy_selinux_file for %s', input_filename)

        return

    shutil.copy(

        os.path.join(target_files_dir, input_path),

        input_filename,

        os.path.join(target_files_dir, partition.upper(), 'etc/selinux',

                     output_filename))
@@ -1041,7 +1048,8 @@ def rebuild_image_with_sepolicy(target_files_dir, 
    shutil.rmtree(os.path.join(vendor_target_files_dir, partition.upper()))

    shutil.copytree(

        os.path.join(target_files_dir, partition.upper()),

        os.path.join(vendor_target_files_dir, partition.upper()))

        os.path.join(vendor_target_files_dir, partition.upper()),

        symlinks=True)



    # Delete then rebuild the partition.

    os.remove(os.path.join(vendor_target_files_dir, 'IMAGES', partition_img))
@@ -1056,6 +1064,8 @@ def rebuild_image_with_sepolicy(target_files_dir, 
    common.RunAndCheckOutput(rebuild_partition_command, verbose=True)



    # Move the newly-created image to the merged target files dir.

    if not os.path.exists(os.path.join(target_files_dir, 'IMAGES')):

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

    shutil.move(

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

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