Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "AAPT: Modified StringPool uniqueness detection"

Browse Source 
This reverts commit 35ecb89a8a.

Reason for revert: <Long make duration (infinite loop)>

Change-Id: I10d1cf53ca3054d40e23b06368ebaff6af69beab
This commit is contained in:
Ryan Mitchell
2018-04-16 18:21:14 +00:00
parent 35ecb89a8a
commit 61ffd40290
2 changed files with 4 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tools/aapt2/StringPool.cpp
View File

@@ -172,10 +172,9 @@ StringPool::Ref StringPool::MakeRef(const StringPiece& str, const Context& conte
StringPool::Ref StringPool::MakeRefImpl(const StringPiece& str, const Context& context,
bool unique) {
if (unique) {
for (auto& indexed_str : indexed_strings_) {
if (str == indexed_str.first && context.priority == indexed_str.second->context.priority) {
return Ref(indexed_str.second);
}
auto iter = indexed_strings_.find(str);
if (iter != std::end(indexed_strings_)) {
return Ref(iter->second);
}
}