Aapt2 Optimize: Exempt particular resources from path shortening
Design: go/no_path_shorten
Bug: b/246845175
Test: Added new atests and verified affected atests pass
Change-Id: I4d5b48ea9f0efd4740823101b9a3d776d151a808
diff --git a/tools/aapt2/optimize/Obfuscator.cpp b/tools/aapt2/optimize/Obfuscator.cpp
index cc21093..8f12f735 100644
--- a/tools/aapt2/optimize/Obfuscator.cpp
+++ b/tools/aapt2/optimize/Obfuscator.cpp
@@ -83,13 +83,18 @@
};
static bool HandleShortenFilePaths(ResourceTable* table,
- std::map<std::string, std::string>& shortened_path_map) {
+ std::map<std::string, std::string>& shortened_path_map,
+ const std::set<ResourceName>& path_shorten_exemptions) {
// used to detect collisions
std::unordered_set<std::string> shortened_paths;
std::set<FileReference*, PathComparator> file_refs;
for (auto& package : table->packages) {
for (auto& type : package->types) {
for (auto& entry : type->entries) {
+ ResourceName resource_name({}, type->named_type, entry->name);
+ if (path_shorten_exemptions.find(resource_name) != path_shorten_exemptions.end()) {
+ continue;
+ }
for (auto& config_value : entry->values) {
FileReference* file_ref = ValueCast<FileReference>(config_value->value.get());
if (file_ref) {
@@ -188,7 +193,8 @@
HandleCollapseKeyStringPool(table, options_.collapse_key_stringpool,
options_.name_collapse_exemptions, options_.id_resource_map);
if (shorten_resource_paths_) {
- return HandleShortenFilePaths(table, options_.shortened_path_map);
+ return HandleShortenFilePaths(table, options_.shortened_path_map,
+ options_.path_shorten_exemptions);
}
return true;
}