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

am b139ae07: am 22354d3c: Merge "Add support for system images that contain the root directory"

Browse Source 
* commit 'b139ae078c8b2598889c2fde1a39a9d64f27dc62':
  Add support for system images that contain the root directory
This commit is contained in:
Daniel Rosenberg
2015-08-01 00:23:58 +00:00
committed by Android Git Automerger
parent b7c57cba9f b139ae078c
commit 93d8ea20b8
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tools/releasetools/common.py
View File

@@ -205,7 +205,7 @@ def LoadInfoDict(input_file, input_dir=None):
makeint("boot_size")
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)
return d
@@ -228,7 +228,7 @@ def LoadDictionaryFromLines(lines):
d[name] = value
return d
def LoadRecoveryFSTab(read_helper, fstab_version):
def LoadRecoveryFSTab(read_helper, fstab_version, system_root_image=False):
class Partition(object):
def __init__(self, mount_point, fs_type, device, length, device2, context):
self.mount_point = mount_point
@@ -320,6 +320,11 @@ def LoadRecoveryFSTab(read_helper, fstab_version):
else:
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