Commit 9b8952c8 authored by Andrew Grieve's avatar Andrew Grieve Committed by Commit Bot

Teach resource_sizes about unwind_cfi

Bug: 819888
Change-Id: I648353f7f4fa6790f63d4d4eca711c1d48d2092e
Reviewed-on: https://chromium-review.googlesource.com/995585
Commit-Queue: agrieve <agrieve@chromium.org>
Reviewed-by: default avatarPeter Wen <wnwen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#548092}
parent d2ddebe7
...@@ -370,6 +370,7 @@ def PrintApkAnalysis(apk_filename, tool_prefix, out_dir, chartjson=None): ...@@ -370,6 +370,7 @@ def PrintApkAnalysis(apk_filename, tool_prefix, out_dir, chartjson=None):
metadata = make_group('Package metadata') metadata = make_group('Package metadata')
unknown = make_group('Unknown files') unknown = make_group('Unknown files')
notices = make_group('licenses.notice file') notices = make_group('licenses.notice file')
unwind_cfi = make_group('unwind_cfi (dev and canary only)')
apk = zipfile.ZipFile(apk_filename, 'r') apk = zipfile.ZipFile(apk_filename, 'r')
try: try:
...@@ -412,6 +413,8 @@ def PrintApkAnalysis(apk_filename, tool_prefix, out_dir, chartjson=None): ...@@ -412,6 +413,8 @@ def PrintApkAnalysis(apk_filename, tool_prefix, out_dir, chartjson=None):
metadata.AddZipInfo(member) metadata.AddZipInfo(member)
elif filename.endswith('.notice'): elif filename.endswith('.notice'):
notices.AddZipInfo(member) notices.AddZipInfo(member)
elif filename.startswith('assets/unwind_cfi'):
unwind_cfi.AddZipInfo(member)
else: else:
unknown.AddZipInfo(member) unknown.AddZipInfo(member)
...@@ -492,6 +495,8 @@ def PrintApkAnalysis(apk_filename, tool_prefix, out_dir, chartjson=None): ...@@ -492,6 +495,8 @@ def PrintApkAnalysis(apk_filename, tool_prefix, out_dir, chartjson=None):
# Main metric that we want to monitor for jumps. # Main metric that we want to monitor for jumps.
normalized_apk_size = total_apk_size normalized_apk_size = total_apk_size
# unwind_cfi exists only in dev, canary, and non-channel builds.
normalized_apk_size -= unwind_cfi.ComputeZippedSize()
# Always look at uncompressed .so. # Always look at uncompressed .so.
normalized_apk_size -= native_code.ComputeZippedSize() normalized_apk_size -= native_code.ComputeZippedSize()
normalized_apk_size += native_code.ComputeUncompressedSize() normalized_apk_size += native_code.ComputeUncompressedSize()
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment