From 175df38e6cca40f7c36d8fff763f9e79caed770f Mon Sep 17 00:00:00 2001 From: Tao Bao Date: Wed, 10 Jan 2018 19:50:37 -0800 Subject: [PATCH] releasetools: Remove two dead functions in ota_from_target_files.py. GetBuildProp() and GetVendorBuildProp() have been factored into BuildInfo class. These two functions were meant to be deleted in commit 481bab8d48a8a40544bdd8e77d6d92b746bdbed8. Test: python -m unittest test_ota_from_target_files Test: No users of these two functions. Change-Id: Id590a46d597939973ef2339cdfea4f5163548d4d --- tools/releasetools/ota_from_target_files.py | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/tools/releasetools/ota_from_target_files.py b/tools/releasetools/ota_from_target_files.py index 1a4383c2b..bed1296e0 100755 --- a/tools/releasetools/ota_from_target_files.py +++ b/tools/releasetools/ota_from_target_files.py @@ -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