openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge "Add support for system images that contain the root directory"

This commit is contained in:
Daniel Rosenberg 2015-08-01 00:10:02 +00:00 committed by Gerrit Code Review
parent 46afd7f981 e6853b0d63
commit 22354d3c49
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tools/releasetools/common.py
View File

@ -202,7 +202,7 @@ def LoadInfoDict(input_file, input_dir=None):
makeint("boot_size") makeint("boot_size")
makeint("fstab_version") makeint("fstab_version")
d["fstab"] = LoadRecoveryFSTab(read_helper, d["fstab_version"]) d["fstab"] = LoadRecoveryFSTab(read_helper, d["fstab_version"], d.get("system_root_image", False))
d["build.prop"] = LoadBuildProp(read_helper) d["build.prop"] = LoadBuildProp(read_helper)
return d return d
@ -225,7 +225,7 @@ def LoadDictionaryFromLines(lines):
d[name] = value d[name] = value
return d return d
def LoadRecoveryFSTab(read_helper, fstab_version): def LoadRecoveryFSTab(read_helper, fstab_version, system_root_image=False):
class Partition(object): class Partition(object):
def __init__(self, mount_point, fs_type, device, length, device2, context): def __init__(self, mount_point, fs_type, device, length, device2, context):
self.mount_point = mount_point self.mount_point = mount_point
@ -317,6 +317,11 @@ def LoadRecoveryFSTab(read_helper, fstab_version):
else: else:
raise ValueError("Unknown fstab_version: \"%d\"" % (fstab_version,)) raise ValueError("Unknown fstab_version: \"%d\"" % (fstab_version,))
# / is used for the system mount point when the root directory is included in
# system. Other areas assume system is always at "/system" so point /system at /
if system_root_image:
assert not d.has_key("/system") and d.has_key("/")
d["/system"] = d["/"]
return d return d