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

Merge "Add <staging-public-group-final> to aapt2 (2/2)" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-05-11 20:27:56 +00:00
committed by Android (Google) Code Review
parent 67976c83e2 2ec8e1b71f
commit a1f1ba172b
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libs/androidfw/AssetManager2.cpp
View File

@@ -226,9 +226,9 @@ void AssetManager2::BuildDynamicRefTable() {
// staging aliases can only be defined by the framework package (which is not a shared
// library), the compile-time package id of the framework is the same across all packages
// that compile against the framework.
for (const auto& package : iter2->packages_) {
for (const auto& package : iter->packages_) {
for (const auto& entry : package.loaded_package_->GetAliasResourceIdMap()) {
iter->dynamic_ref_table->addAlias(entry.first, entry.second);
iter2->dynamic_ref_table->addAlias(entry.first, entry.second);
}
}
}

4
tools/aapt2/format/binary/BinaryResourceParser.cpp
View File

@@ -255,7 +255,7 @@ bool BinaryResourceParser::ParsePackage(const ResChunk_header* chunk) {
break;
case android::RES_TABLE_STAGED_ALIAS_TYPE:
if (!ParseOverlayable(parser.chunk())) {
if (!ParseStagedAliases(parser.chunk())) {
return false;
}
break;
@@ -518,7 +518,7 @@ bool BinaryResourceParser::ParseStagedAliases(const ResChunk_header* chunk) {
return false;
}
// Set the staged if of the finalized resource.
// Set the staged id of the finalized resource.
const auto& resource_name = iter->second;
const StagedId staged_id_def{.id = staged_id};
if (!table_->AddResource(NewResourceBuilder(resource_name)