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

Commit 62e2a0cd authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Use symlinks instead of hard links" into main am: 3d0567ca am: 6ec1c0e1 am: 38de8300 

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



Change-Id: Ib0c6607b3abd841d54f1a866635723709ba63393
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 592678fd 38de8300

tools/releasetools/ota_utils.py

+9 −13
Original line number Diff line number Diff line
@@ -755,10 +755,8 @@ def ExtractTargetFiles(path: str): 




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")

  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:
@@ -773,10 +771,8 @@ def GetPartitionImages(target_files_dir: str, ab_partitions, allow_empty=True): 




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")

  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 @@ def CopyTargetFilesDir(input_dir): 
    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)):