From 35ecb89a8aa68f24d2e991df5bb9964ad15075dc Mon Sep 17 00:00:00 2001 From: y Date: Fri, 13 Apr 2018 11:25:12 -0700 Subject: AAPT: Modified StringPool uniqueness detection b/77862560 detected that when converting an apk to binary using aapt2, all resource ids of attributes that have been replaced with resource identifiers become set to the identifier of the first attribute. This is because the attribute names are all empty because the names are not necessary since the resource ids are present. The empty attribute names all map to the same string pool reference and cause all the ids to be the first empty string into the string pool. Bug: 77862560 Test: Converted apk in listed bug from proto to binary and observed correct resource ids and correct badging. Change-Id: I635c13cd1ad7a395fe40a57198cfe5ec91602d01 --- tools/aapt2/StringPool.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'tools/aapt2/StringPool.cpp') diff --git a/tools/aapt2/StringPool.cpp b/tools/aapt2/StringPool.cpp index b0ce9e1ec947..73a8259a3a87 100644 --- a/tools/aapt2/StringPool.cpp +++ b/tools/aapt2/StringPool.cpp @@ -172,9 +172,10 @@ StringPool::Ref StringPool::MakeRef(const StringPiece& str, const Context& conte StringPool::Ref StringPool::MakeRefImpl(const StringPiece& str, const Context& context, bool unique) { if (unique) { - auto iter = indexed_strings_.find(str); - if (iter != std::end(indexed_strings_)) { - return Ref(iter->second); + for (auto& indexed_str : indexed_strings_) { + if (str == indexed_str.first && context.priority == indexed_str.second->context.priority) { + return Ref(indexed_str.second); + } } } -- cgit v1.2.3