StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "releasetools: Remove some legacy paths for prop rewrites."

Browse Source
This commit is contained in:
Tao Bao
2019-06-24 15:47:33 +00:00
committed by Gerrit Code Review
parent 4daa755fb2 338c1b7e90
commit eb7cb468e4
1 changed files with 27 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
tools/releasetools/sign_target_files_apks.py
View File

@@ -488,23 +488,33 @@ def ProcessTargetFiles(input_tf_zip, output_tf_zip, misc_info,
continue continue
# System properties. # System properties.
elif filename in ("SYSTEM/build.prop", elif filename in (
"VENDOR/build.prop", "SYSTEM/build.prop",
"SYSTEM/vendor/build.prop",
"ODM/build.prop", # legacy "VENDOR/build.prop",
"ODM/etc/build.prop", "SYSTEM/vendor/build.prop",
"VENDOR/odm/build.prop", # legacy
"VENDOR/odm/etc/build.prop", "ODM/etc/build.prop",
"PRODUCT/build.prop", "VENDOR/odm/etc/build.prop",
"SYSTEM/product/build.prop",
"PRODUCT_SERVICES/build.prop", "PRODUCT/build.prop",
"SYSTEM/product_services/build.prop", "SYSTEM/product/build.prop",
"SYSTEM/etc/prop.default",
"BOOT/RAMDISK/prop.default", "PRODUCT_SERVICES/build.prop",
"BOOT/RAMDISK/default.prop", # legacy "SYSTEM/product_services/build.prop",
"ROOT/default.prop", # legacy
"RECOVERY/RAMDISK/prop.default", "SYSTEM/etc/prop.default",
"RECOVERY/RAMDISK/default.prop"): # legacy "BOOT/RAMDISK/prop.default",
"RECOVERY/RAMDISK/prop.default",
# ROOT/default.prop is a legacy path, but may still exist for upgrading
# devices that don't support `property_overrides_split_enabled`.
"ROOT/default.prop",
# 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"):
print("Rewriting %s:" % (filename,)) print("Rewriting %s:" % (filename,))
if stat.S_ISLNK(info.external_attr >> 16): if stat.S_ISLNK(info.external_attr >> 16):
new_data = data new_data = data