Commit 6ed1b75f authored by Andrew Grieve's avatar Andrew Grieve Committed by Chromium LUCI CQ

Android: Fix apk_operations.py detection of dex compilation mode on Q

Bug: None
Change-Id: Id16675a25765e601be76805150cd2dfc9b62a2d6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2601518
Auto-Submit: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: default avatarClark DuVall <cduvall@chromium.org>
Commit-Queue: Clark DuVall <cduvall@chromium.org>
Cr-Commit-Position: refs/heads/master@{#839368}
parent dff532c4
...@@ -484,6 +484,10 @@ def _RunDiskUsage(devices, package_name): ...@@ -484,6 +484,10 @@ def _RunDiskUsage(devices, package_name):
awful_wrapping = r'\s*'.join('compilation_filter=') awful_wrapping = r'\s*'.join('compilation_filter=')
for m in re.finditer(awful_wrapping + r'([\s\S]+?)[\],]', package_output): for m in re.finditer(awful_wrapping + r'([\s\S]+?)[\],]', package_output):
compilation_filters.add(re.sub(r'\s+', '', m.group(1))) compilation_filters.add(re.sub(r'\s+', '', m.group(1)))
# Starting Android Q, output looks like:
# arm: [status=speed-profile] [reason=install]
for m in re.finditer(r'\[status=(.+?)\]', package_output):
compilation_filters.add(m.group(1))
compilation_filter = ','.join(sorted(compilation_filters)) compilation_filter = ','.join(sorted(compilation_filters))
data_dir_sizes = _DuHelper(d, '%s/{*,.*}' % data_dir, run_as=package_name) data_dir_sizes = _DuHelper(d, '%s/{*,.*}' % data_dir, run_as=package_name)
......
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