Merge "Ovewrite build props in all ramdisk fragments" am: 4556196c78
Original change: https://android-review.googlesource.com/c/platform/build/+/2383512 Change-Id: Ifcd5f0dff45753c547631e5b54fe734b81841a4f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
9ab18ee6b1
1 changed files with 6 additions and 1 deletions
|
@ -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,
|
||||
|
|
Loading…
Reference in a new issue