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

am a04e6b89: am dd68e68f: Merge "Override properties that point to out/ directory."

Browse Source 
* commit 'a04e6b89ec262f4dd38c9d80ee05ce313bab9347':
  Override properties that point to out/ directory.
This commit is contained in:
Tao Bao
2015-07-21 18:25:36 +00:00
committed by Android Git Automerger
parent e8d465f36b a04e6b89ec
commit 1358123688
3 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
tools/releasetools/common.py
View File

@@ -148,15 +148,20 @@ def LoadInfoDict(input_file, input_dir=None):
if "fstab_version" not in d:
d["fstab_version"] = "1"
# During building, we use the "file_contexts" in the out/ directory tree.
# It is no longer available when (re)generating from target_files zip. So
# when generating from target_files zip, we look for a copy under META/
# first, if not available search under BOOT/RAMDISK/. Note that we may need
# a different file_contexts to build images than the one running on device,
# such as when enabling system_root_image. In that case, we must have the
# one for building copied to META/.
# A few properties are stored as links to the files in the out/ directory.
# It works fine with the build system. However, they are no longer available
# when (re)generating from target_files zip. If input_dir is not None, we
# are doing repacking. Redirect those properties to the actual files in the
# unzipped directory.
if input_dir is not None:
# We carry a copy of file_contexts under META/. If not available, search
# BOOT/RAMDISK/. Note that sometimes we may need a different file_contexts
# to build images than the one running on device, such as when enabling
# system_root_image. In that case, we must have the one for image
# generation copied to META/.
fc_config = os.path.join(input_dir, "META", "file_contexts")
if d.get("system_root_image") == "true":
assert os.path.exists(fc_config)
if not os.path.exists(fc_config):
fc_config = os.path.join(input_dir, "BOOT", "RAMDISK", "file_contexts")
if not os.path.exists(fc_config):
@@ -165,6 +170,12 @@ 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".
if d.get("system_root_image") == "true":
d["ramdisk_dir"] = os.path.join(input_dir, "ROOT")
d["ramdisk_fs_config"] = os.path.join(
input_dir, "META", "root_filesystem_config.txt")
try:
data = read_helper("META/imagesizes.txt")
for line in data.split("\n"):