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

Commit 6ed4fdaa authored by Hongguang Chen's avatar Hongguang Chen Committed by Automerger Merge Worker
Browse files

Merge "Overwrite prop.default in all ramdisk fragments" am: b70d35ce am:... 

Merge "Overwrite prop.default in all ramdisk fragments" am: b70d35ce am: a6cc8eac am: daa3c4e2

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



Change-Id: I71468643c9a5e2b3a7ef21a3531e6295aab4fa02
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f53facfc daa3c4e2

tools/releasetools/sign_target_files_apks.py

+5 −3
Original line number Diff line number Diff line
@@ -532,11 +532,13 @@ def IsBuildPropFile(filename): 
      # as a symlink in the current code. So it's a no-op here. Keeping the

      # path here for clarity.

      # 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

      # VENDOR_BOOT/RAMDISK_FRAGMENTS/recovery/RAMDISK/default.prop, and

      # default.prop can be a symbolic link to prop.default, so overwrite all

      # files that ends with build.prop, default.prop or prop.default

      "RECOVERY/RAMDISK/default.prop") or \

        filename.endswith("build.prop") or \

        filename.endswith("/default.prop")

        filename.endswith("/default.prop") or \

        filename.endswith("/prop.default")





def ProcessTargetFiles(input_tf_zip, output_tf_zip, misc_info,