Loading tools/releasetools/common.py +32 −11 Original line number Original line Diff line number Diff line Loading @@ -75,6 +75,11 @@ OPTIONS = Options() # Values for "certificate" in apkcerts that mean special things. # Values for "certificate" in apkcerts that mean special things. SPECIAL_CERT_STRINGS = ("PRESIGNED", "EXTERNAL") SPECIAL_CERT_STRINGS = ("PRESIGNED", "EXTERNAL") # The partitions allowed to be signed by AVB (Android verified boot 2.0). AVB_PARTITIONS = ('boot', 'recovery', 'system', 'vendor', 'dtbo') class ErrorCode(object): class ErrorCode(object): """Define error_codes for failures that happen during the actual """Define error_codes for failures that happen during the actual update package installation. update package installation. Loading Loading @@ -727,10 +732,18 @@ def SignFile(input_name, output_name, key, password, min_api_level=None, def CheckSize(data, target, info_dict): def CheckSize(data, target, info_dict): """Check the data string passed against the max size limit, if """Checks the data string passed against the max size limit. any, for the given target. Raise exception if the data is too big. Print a warning if the data is nearing the maximum size.""" For non-AVB images, raise exception if the data is too big. Print a warning if the data is nearing the maximum size. For AVB images, the actual image size should be identical to the limit. Args: data: A string that contains all the data for the partition. target: The partition name. The ".img" suffix is optional. info_dict: The dict to be looked up for relevant info. """ if target.endswith(".img"): if target.endswith(".img"): target = target[:-4] target = target[:-4] mount_point = "/" + target mount_point = "/" + target Loading @@ -750,6 +763,14 @@ def CheckSize(data, target, info_dict): return return size = len(data) size = len(data) # target could be 'userdata' or 'cache'. They should follow the non-AVB image # path. if info_dict.get("avb_enable") == "true" and target in AVB_PARTITIONS: if size != limit: raise ExternalError( "Mismatching image size for %s: expected %d actual %d" % ( target, limit, size)) else: pct = float(size) * 100.0 / limit pct = float(size) * 100.0 / limit msg = "%s size (%d) is %.2f%% of limit (%d)" % (target, size, pct, limit) msg = "%s size (%d) is %.2f%% of limit (%d)" % (target, size, pct, limit) if pct >= 99.0: if pct >= 99.0: Loading Loading
tools/releasetools/common.py +32 −11 Original line number Original line Diff line number Diff line Loading @@ -75,6 +75,11 @@ OPTIONS = Options() # Values for "certificate" in apkcerts that mean special things. # Values for "certificate" in apkcerts that mean special things. SPECIAL_CERT_STRINGS = ("PRESIGNED", "EXTERNAL") SPECIAL_CERT_STRINGS = ("PRESIGNED", "EXTERNAL") # The partitions allowed to be signed by AVB (Android verified boot 2.0). AVB_PARTITIONS = ('boot', 'recovery', 'system', 'vendor', 'dtbo') class ErrorCode(object): class ErrorCode(object): """Define error_codes for failures that happen during the actual """Define error_codes for failures that happen during the actual update package installation. update package installation. Loading Loading @@ -727,10 +732,18 @@ def SignFile(input_name, output_name, key, password, min_api_level=None, def CheckSize(data, target, info_dict): def CheckSize(data, target, info_dict): """Check the data string passed against the max size limit, if """Checks the data string passed against the max size limit. any, for the given target. Raise exception if the data is too big. Print a warning if the data is nearing the maximum size.""" For non-AVB images, raise exception if the data is too big. Print a warning if the data is nearing the maximum size. For AVB images, the actual image size should be identical to the limit. Args: data: A string that contains all the data for the partition. target: The partition name. The ".img" suffix is optional. info_dict: The dict to be looked up for relevant info. """ if target.endswith(".img"): if target.endswith(".img"): target = target[:-4] target = target[:-4] mount_point = "/" + target mount_point = "/" + target Loading @@ -750,6 +763,14 @@ def CheckSize(data, target, info_dict): return return size = len(data) size = len(data) # target could be 'userdata' or 'cache'. They should follow the non-AVB image # path. if info_dict.get("avb_enable") == "true" and target in AVB_PARTITIONS: if size != limit: raise ExternalError( "Mismatching image size for %s: expected %d actual %d" % ( target, limit, size)) else: pct = float(size) * 100.0 / limit pct = float(size) * 100.0 / limit msg = "%s size (%d) is %.2f%% of limit (%d)" % (target, size, pct, limit) msg = "%s size (%d) is %.2f%% of limit (%d)" % (target, size, pct, limit) if pct >= 99.0: if pct >= 99.0: Loading
