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

Commit 9ab18ee6 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Ovewrite build props in all ramdisk fragments" am: 4556196c 

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



Change-Id: Ifcd5f0dff45753c547631e5b54fe734b81841a4f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3f20c026 4556196c

tools/releasetools/sign_target_files_apks.py

+6 −1
Original line number Diff line number Diff line
@@ -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,