commit e41c75cb83cd32cc8268b52f6de1c78822d3dda0
author Kelvin Zhang <zhangkelvin@google.com> Wed May 08 20:37:41 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed May 08 20:37:41 2024 +0000
tree ceb40f6b66c92bfd3ac119ba2f677665ff23c136
parent 015de62d7a6b2b4ffb5c2ac557d82143401ed5b4
parent 681597df18cf9105c59551808dea16b742893f30

Merge "Revert "Fix retrofit OTA generation failures"" into main

tools/releasetools/ota_utils.py

diff --git a/tools/releasetools/ota_utils.py b/tools/releasetools/ota_utils.py
index 27364d0..048a497 100644
--- a/tools/releasetools/ota_utils.py
+++ b/tools/releasetools/ota_utils.py
@@ -1111,8 +1111,9 @@
       relative_path = path.removeprefix(input_dir).removeprefix("/")
       if not Fnmatch(relative_path, UNZIP_PATTERN):
         continue
-      target_path = os.path.join(
-          output_dir, relative_path)
-      os.makedirs(os.path.dirname(target_path), exist_ok=True)
-      shutil.copy(path, target_path)
+      if filename.endswith(".prop") or filename == "prop.default" or "/etc/vintf/" in relative_path:
+        target_path = os.path.join(
+            output_dir, relative_path)
+        os.makedirs(os.path.dirname(target_path), exist_ok=True)
+        shutil.copy(path, target_path)
   return output_dir