Use symlinks instead of hard links
Test: th
Bug: 283172692
Change-Id: Idb91448677d94370e052755842a396cc0e1eb588
diff --git a/tools/releasetools/ota_utils.py b/tools/releasetools/ota_utils.py
index 9b3367e..5c70223 100644
--- a/tools/releasetools/ota_utils.py
+++ b/tools/releasetools/ota_utils.py
@@ -755,12 +755,10 @@
def LocatePartitionPath(target_files_dir: str, partition: str, allow_empty):
- path = os.path.join(target_files_dir, "RADIO", partition + ".img")
- if os.path.exists(path):
- return path
- path = os.path.join(target_files_dir, "IMAGES", partition + ".img")
- if os.path.exists(path):
- return path
+ for subdir in TARGET_FILES_IMAGES_SUBDIR:
+ path = os.path.join(target_files_dir, subdir, partition + ".img")
+ if os.path.exists(path):
+ return path
if allow_empty:
return ""
raise common.ExternalError(
@@ -773,12 +771,10 @@
def LocatePartitionMap(target_files_dir: str, partition: str):
- path = os.path.join(target_files_dir, "RADIO", partition + ".map")
- if os.path.exists(path):
- return path
- path = os.path.join(target_files_dir, "IMAGES", partition + ".map")
- if os.path.exists(path):
- return path
+ for subdir in TARGET_FILES_IMAGES_SUBDIR:
+ path = os.path.join(target_files_dir, subdir, partition + ".map")
+ if os.path.exists(path):
+ return path
return ""
@@ -1061,7 +1057,7 @@
if common.IsSparseImage(src):
return common.UnsparseImage(src, dst)
else:
- return os.link(src, dst)
+ return os.symlink(os.path.realpath(src), dst)
for subdir in TARGET_FILES_IMAGES_SUBDIR:
if not os.path.exists(os.path.join(input_dir, subdir)):