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

releasetools: Change the base_fs assertion into warnings.

Browse Source 
am: b079b50e2a

* commit 'b079b50e2ae2748f77139618cd5dfb8ef06d8418':
  releasetools: Change the base_fs assertion into warnings.

Change-Id: Iaa24f81e864886ef6f4ebe05ea514fa977306fb4
This commit is contained in:
Tao Bao
2016-05-03 16:59:17 +00:00
committed by android-build-merger
parent 0451b2f946 b079b50e2a
commit e094740249
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tools/releasetools/common.py
View File

@@ -186,16 +186,22 @@ def LoadInfoDict(input_file, input_dir=None):
if "system_base_fs_file" in d: if "system_base_fs_file" in d:
basename = os.path.basename(d["system_base_fs_file"]) basename = os.path.basename(d["system_base_fs_file"])
system_base_fs_file = os.path.join(input_dir, "META", basename) system_base_fs_file = os.path.join(input_dir, "META", basename)
assert os.path.exists(system_base_fs_file), \ if os.path.exists(system_base_fs_file):
"failed to find system base fs file: %s" % (system_base_fs_file,)
d["system_base_fs_file"] = system_base_fs_file d["system_base_fs_file"] = system_base_fs_file
else:
print "Warning: failed to find system base fs file: %s" % (
system_base_fs_file,)
del d["system_base_fs_file"]
if "vendor_base_fs_file" in d: if "vendor_base_fs_file" in d:
basename = os.path.basename(d["vendor_base_fs_file"]) basename = os.path.basename(d["vendor_base_fs_file"])
vendor_base_fs_file = os.path.join(input_dir, "META", basename) vendor_base_fs_file = os.path.join(input_dir, "META", basename)
assert os.path.exists(vendor_base_fs_file), \ if os.path.exists(vendor_base_fs_file):
"failed to find vendor base fs file: %s" % (vendor_base_fs_file,)
d["vendor_base_fs_file"] = vendor_base_fs_file d["vendor_base_fs_file"] = vendor_base_fs_file
else:
print "Warning: failed to find vendor base fs file: %s" % (
vendor_base_fs_file,)
del d["vendor_base_fs_file"]
try: try:
data = read_helper("META/imagesizes.txt") data = read_helper("META/imagesizes.txt")