Merge "releasetools: Remove two dead functions in ota_from_target_files.py."

am: 155a140c82

Change-Id: I1a7572a10c713c79ee0c8b8dcad39b69c1de60c6
This commit is contained in:
Tao Bao 2018-01-11 22:48:13 +00:00 committed by android-build-merger
commit 11348df23b

View file

@ -683,23 +683,6 @@ def WriteMetadata(metadata, output_zip):
compress_type=zipfile.ZIP_STORED)
def GetBuildProp(prop, info_dict):
"""Returns the inquired build property from a given info_dict."""
try:
return info_dict.get("build.prop", {})[prop]
except KeyError:
raise common.ExternalError("couldn't find %s in build.prop" % (prop,))
def GetVendorBuildProp(prop, info_dict):
"""Returns the inquired vendor build property from a given info_dict."""
try:
return info_dict.get("vendor.build.prop", {})[prop]
except KeyError:
raise common.ExternalError(
"couldn't find %s in vendor.build.prop" % (prop,))
def HandleDowngradeMetadata(metadata, target_info, source_info):
# Only incremental OTAs are allowed to reach here.
assert OPTIONS.incremental_source is not None