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

Merge "releasetools: Rename the ramdisk_dir in prop dict to root_dir."

Browse Source
This commit is contained in:
Tao Bao
2018-07-23 16:33:46 +00:00
committed by Gerrit Code Review
parent 9f5ea99a34 8bfd3c7483
commit d094713952
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tools/releasetools/common.py
View File

@@ -196,10 +196,10 @@ def LoadInfoDict(input_file, input_dir=None):
if fc_config:
d["selinux_fc"] = fc_config
# Similarly we need to redirect "ramdisk_dir" and "ramdisk_fs_config".
# Similarly we need to redirect "root_dir" and "root_fs_config".
if d.get("system_root_image") == "true":
d["ramdisk_dir"] = os.path.join(input_dir, "ROOT")
d["ramdisk_fs_config"] = os.path.join(
d["root_dir"] = os.path.join(input_dir, "ROOT")
d["root_fs_config"] = os.path.join(
input_dir, "META", "root_filesystem_config.txt")
# Redirect {system,vendor}_base_fs_file.