summaryrefslogtreecommitdiff
path: root/tools/aapt2/ResourceTable.cpp
diff options
context:
space:
mode:
author Yurii Zubrytskyi <zyy@google.com> 2021-10-07 14:33:55 -0700
committer Yurii Zubrytskyi <zyy@google.com> 2021-10-14 05:46:16 +0000
commit76786b9034dead4075e30f66f97e0c75ac0c5bcd (patch)
treeeb6cf3a58c50257f9b5d2d21d45471d11a6d91d6 /tools/aapt2/ResourceTable.cpp
parentb0e40f36b26084439444461a67625523398a0af4 (diff)
[aapt2] Update the new project tracking for duplicate types
When tracking the types that require creating a new package update the map every time we see it, not only when adding one Bug: 201388769 Test: make aapt2_tests && aapt2_tests Change-Id: I3ed5bac1d64c0e7a831f59d58952fe4c34035776
Diffstat (limited to 'tools/aapt2/ResourceTable.cpp')
-rw-r--r--tools/aapt2/ResourceTable.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/aapt2/ResourceTable.cpp b/tools/aapt2/ResourceTable.cpp
index ad014a23be87..77f0ef0ed94c 100644
--- a/tools/aapt2/ResourceTable.cpp
+++ b/tools/aapt2/ResourceTable.cpp
@@ -436,12 +436,12 @@ ResourceTableView ResourceTable::GetPartitionedView(const ResourceTableViewOptio
const size_t index = type_index_iter->second;
if (new_packages.size() == index) {
new_packages.emplace_back(ResourceTablePackageView{package.name, package.id});
- type_new_package_index[type.type] = index + 1;
}
// Move the type into a new package
auto& other_package = new_packages[index];
type_inserter.Insert(other_package.types, std::move(type));
+ type_new_package_index[type.type] = index + 1;
type_it = package.types.erase(type_it);
}
}