| commit | f45d2fad2ecd3cb3c4aeee3014763e01b59eab09 | [log] [tgz] |
|---|---|---|
| author | Adam Lesinski <adamlesinski@google.com> | Tue Jul 28 12:10:36 2015 -0700 |
| committer | Adam Lesinski <adamlesinski@google.com> | Tue Jul 28 12:26:57 2015 -0700 |
| tree | 8d483d3552a4425d7bbe013284b1dd5e8f840543 | |
| parent | beb6e66817e084c8a1ac92ecaeb6f0c73d11cc49 [diff] |
AAPT: Fix resource versioning Resource generation was greedy, so when an attribute with sdk level 21 was used in a resource with v1, and a different attribute with sdk level 21 was used in a resource with v11, a v21 resource would be synthesized, but it would contain the attribute from v1 instead of v11. This change fixes the issue, having the higher versioned resource take precedence. Bug:22793816 Change-Id: Ia687f56b0d9969e424111477d55d9804255b22e9