Commit 89fd507b authored by Andrew Grieve's avatar Andrew Grieve Committed by Commit Bot

Android: Fix .res.info file entries for supersize

This broke in 29c97e18.
It's hard to notice because supersize diffs don't consider symbols
to be changed when only their source directory changes.

Bug: 1034651
Change-Id: I06ff5ab9bbc3362b3e945800eaad5d6b0f516b14
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1968255
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Commit-Queue: Peter Wen <wnwen@chromium.org>
Auto-Submit: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: default avatarPeter Wen <wnwen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#725542}
parent f732fb8a
...@@ -113,12 +113,9 @@ def _ZipResources(resource_dirs, zip_path, ignore_pattern): ...@@ -113,12 +113,9 @@ def _ZipResources(resource_dirs, zip_path, ignore_pattern):
for index, resource_dir in enumerate(resource_dirs): for index, resource_dir in enumerate(resource_dirs):
for path, archive_path in resource_utils.IterResourceFilesInDirectories( for path, archive_path in resource_utils.IterResourceFilesInDirectories(
[resource_dir], ignore_pattern): [resource_dir], ignore_pattern):
files_to_zip_without_generated[archive_path] = path
resource_dir_name = os.path.basename(resource_dir) resource_dir_name = os.path.basename(resource_dir)
archive_path = '{}_{}/{}'.format(index, resource_dir_name, archive_path) archive_path = '{}_{}/{}'.format(index, resource_dir_name, archive_path)
# We want the original resource dirs in the .info file rather than the
# generated overridden path.
if not path.startswith('/tmp'):
files_to_zip_without_generated[archive_path] = path
files_to_zip[archive_path] = path files_to_zip[archive_path] = path
resource_utils.CreateResourceInfoFile(files_to_zip_without_generated, resource_utils.CreateResourceInfoFile(files_to_zip_without_generated,
zip_path) zip_path)
......
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