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

Add <staging-public-group-final> to aapt2 (2/2)

Browse Source 
Fixes BinaryResourceParser loading of alias chunk and makes changes
that did not get committed in 2fedba9a32.

Bug: 183411356
Test: aapt2_test
Change-Id: Ieff9166100019f38ddcfe900014709b15db24e43
This commit is contained in:
Ryan Mitchell
2021-05-11 08:28:00 -07:00
parent 2fedba9a32
commit 2ec8e1b71f
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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)