From e51b671e1ed879b78929e5ba4249874af85bece2 Mon Sep 17 00:00:00 2001 From: Tao Bao Date: Mon, 26 Jun 2017 11:00:02 -0700 Subject: [PATCH] Rewrite the prop file at BOOT/RAMDISK/prop.default. This is the new prop filename after commit a6b68e72b1a6238547fcbc00d8446ac0d755eb2b. Bug: 63038934 Test: sign_target_files_apks.py with marlin TF.zip. Check the contents in BOOT/RAMDISK/prop.default in signed-TF.zip. Change-Id: I78106b68c387769bce50804c141c9e14dff55c09 --- tools/releasetools/sign_target_files_apks.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/releasetools/sign_target_files_apks.py b/tools/releasetools/sign_target_files_apks.py index 71311e6c42..0fe72cc6e3 100755 --- a/tools/releasetools/sign_target_files_apks.py +++ b/tools/releasetools/sign_target_files_apks.py @@ -236,6 +236,7 @@ def ProcessTargetFiles(input_tf_zip, output_tf_zip, misc_info, elif info.filename in ("SYSTEM/build.prop", "VENDOR/build.prop", "SYSTEM/etc/prop.default", + "BOOT/RAMDISK/prop.default", "BOOT/RAMDISK/default.prop", # legacy "ROOT/default.prop", # legacy "RECOVERY/RAMDISK/prop.default", @@ -246,7 +247,8 @@ def ProcessTargetFiles(input_tf_zip, output_tf_zip, misc_info, else: new_data = RewriteProps(data, misc_info) common.ZipWriteStr(output_tf_zip, out_info, new_data) - if info.filename in ("BOOT/RAMDISK/default.prop", # legacy + if info.filename in ("BOOT/RAMDISK/prop.default", + "BOOT/RAMDISK/default.prop", # legacy "ROOT/default.prop", # legacy "RECOVERY/RAMDISK/prop.default", "RECOVERY/RAMDISK/default.prop"): # legacy