commit e62232d71ab4b606773adea1d589613be1968e1d
author Daniel Norman <danielnorman@google.com> Mon Jul 19 20:39:09 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jul 19 20:39:09 2021 +0000
tree 59867e62e511cd4f156d0817d3c0152d4bddd817
parent fa26e5b8db48a5be934d0eac69305f01d1905dd0
parent 0e4403e8469a20446158e6dedf9e55e63d1c3359

Merge "Adjust some behaviors for --rebuild-sepolicy"

tools/releasetools/merge_target_files.py

diff --git a/tools/releasetools/merge_target_files.py b/tools/releasetools/merge_target_files.py
index c1fa9e7..7086f21 100755
--- a/tools/releasetools/merge_target_files.py
+++ b/tools/releasetools/merge_target_files.py
@@ -1000,8 +1000,15 @@
   # 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 @@
     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 @@
     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))