Commit 1cbd75b6 authored by Andrew Grieve's avatar Andrew Grieve Committed by Commit Bot

Remove double-reversing of resource .zips

It was being reversed in build_configs, then again in
process_resources.py

Bug: 782316
Change-Id: I654a77d8e859f068101fadf99400c26582844d82
Reviewed-on: https://chromium-review.googlesource.com/842950Reviewed-by: default avatarEric Stevenson <estevenson@chromium.org>
Commit-Queue: agrieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#526507}
parent 61722682
......@@ -782,9 +782,7 @@ def _PackageApk(options, dep_subdirs, temp_dir, gen_dir, r_txt_path):
link_command += ['--manifest', options.android_manifest]
partials = _CompileDeps(options.aapt_path, dep_subdirs, temp_dir)
# It only works if partials are reversed (resource clobbering). This could be
# due to aapt2 processes the partials in reversed order (compared to aapt)
for partial in reversed(partials):
for partial in partials:
link_command += ['-R', partial]
# Creates a .zip with AndroidManifest.xml, resources.arsc, res/*
......
......@@ -410,9 +410,6 @@ def main(argv):
direct_resources_deps = deps.Direct('android_resources')
all_resources_deps = deps.All('android_resources')
# Resources should be ordered with the highest-level dependency first so that
# overrides are done correctly.
all_resources_deps.reverse()
# Initialize some common config.
# Any value that needs to be queryable by dependents must go within deps_info.
......
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