StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[Bugfix] Check for presence before moving" am: f3f9672549

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/2059633

Change-Id: I52d82077f641d1900146a72bfadb8c159160cb81
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2022-04-25 11:39:21 +00:00
committed by Automerger Merge Worker
parent 7070268adb f3f9672549
commit 244cbdf09d
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tools/releasetools/merge/merge_target_files.py
View File

@@ -149,6 +149,13 @@ OPTIONS.framework_dexpreopt_tools = None
OPTIONS.vendor_dexpreopt_config = None
def move_only_exists(source, destination):
"""Judge whether the file exists and then move the file."""
if os.path.exists(source):
shutil.move(source, destination)
def create_merged_package(temp_dir):
"""Merges two target files packages into one target files structure.
@@ -286,9 +293,8 @@ def rebuild_image_with_sepolicy(target_files_dir):
shutil.move(
os.path.join(vendor_target_files_dir, 'IMAGES', partition_img),
os.path.join(target_files_dir, 'IMAGES', partition_img))
shutil.move(
os.path.join(vendor_target_files_dir, 'IMAGES', partition_map),
os.path.join(target_files_dir, 'IMAGES', partition_map))
move_only_exists(os.path.join(vendor_target_files_dir, 'IMAGES', partition_map),
os.path.join(target_files_dir, 'IMAGES', partition_map))
def copy_recovery_file(filename):
for subdir in ('VENDOR', 'SYSTEM/vendor'):