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

Merge "Ovewrite build props in all ramdisk fragments" am: 4556196c78 am: 9ab18ee6b1

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

Change-Id: I161b2ab6df3049e240ca364dd5553feac945f73c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2023-01-11 12:11:19 +00:00 committed by Automerger Merge Worker
commit 41a3361740
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
tools/releasetools/sign_target_files_apks.py
View file

@ -531,7 +531,12 @@ def IsBuildPropFile(filename):
# RECOVERY/RAMDISK/default.prop is a legacy path, but will always exist
# as a symlink in the current code. So it's a no-op here. Keeping the
# path here for clarity.
"RECOVERY/RAMDISK/default.prop") or filename.endswith("build.prop")
# Some build props might be stored under path
# VENDOR_BOOT/RAMDISK_FRAGMENTS/recovery/RAMDISK/default.prop
# so overwrite all files that ends with build.prop or default.prop
"RECOVERY/RAMDISK/default.prop") or \
filename.endswith("build.prop") or \
filename.endswith("/default.prop")
def ProcessTargetFiles(input_tf_zip, output_tf_zip, misc_info,