tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[Bugfix] Check for presence before moving

Browse source 
There are vendor products but no *.map situation

Signed-off-by: jiangxu5 <jiangxu5@xiaomi.com>
Change-Id: I5068abd1f81bca53ffcbdd415874b8fb49408e30
This commit is contained in:
jiangxu5 2022-04-11 16:02:48 +08:00
parent d7856b74dc
commit 2bd4273865
1 changed files with 9 additions and 3 deletions
Show stats 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 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): def create_merged_package(temp_dir):
"""Merges two target files packages into one target files structure. """Merges two target files packages into one target files structure.
@ -286,9 +293,8 @@ def rebuild_image_with_sepolicy(target_files_dir):
shutil.move( shutil.move(
os.path.join(vendor_target_files_dir, 'IMAGES', partition_img), os.path.join(vendor_target_files_dir, 'IMAGES', partition_img),
os.path.join(target_files_dir, 'IMAGES', partition_img)) os.path.join(target_files_dir, 'IMAGES', partition_img))
shutil.move( move_only_exists(os.path.join(vendor_target_files_dir, 'IMAGES', partition_map),
os.path.join(vendor_target_files_dir, 'IMAGES', partition_map), os.path.join(target_files_dir, 'IMAGES', partition_map))
os.path.join(target_files_dir, 'IMAGES', partition_map))
def copy_recovery_file(filename): def copy_recovery_file(filename):
for subdir in ('VENDOR', 'SYSTEM/vendor'): for subdir in ('VENDOR', 'SYSTEM/vendor'):