| commit | 83f2255f69729e0e97539e96e5e6161843e85823 | [log] [tgz] |
|---|---|---|
| author | Adam Lesinski <adamlesinski@google.com> | Sat Nov 07 11:51:23 2015 -0800 |
| committer | Adam Lesinski <adamlesinski@google.com> | Sat Nov 07 11:51:23 2015 -0800 |
| tree | 212ce1c375059cc7f1c373ea6110c011d088d954 | |
| parent | 27afb9e8894b512b21fcca6ce142f40f1ee16cbb [diff] |
AAPT2: Disambiguate merging of resources Merging local app resources is slightly different than merging resources from a static library. Local app resources may not have a package name set, but we do take interest in the ID set for the package (should be 0x0 or match the ID of the app we're building). Static library resources have an explicit package name defined for them, so we only merge resources from that package. Change-Id: I95e559ae94cc1df6972e77a347b1b37a93674c4d