diff options
| author | Ryan Mitchell <rtmitchell@google.com> | 2021-05-11 08:28:00 -0700 |
|---|---|---|
| committer | Ryan Mitchell <rtmitchell@google.com> | 2021-05-11 08:28:00 -0700 |
| commit | 2ec8e1b71fae1417e7d4df09600956b2c67a4936 (patch) | |
| tree | 935f3e7a3f40679fa0e6650866a8d24bd7eb85f4 /tools | |
| parent | 2fedba9a32d9e92344eaf6e9faf5b43e1bc2ae70 (diff) | |
Add <staging-public-group-final> to aapt2 (2/2)
Fixes BinaryResourceParser loading of alias chunk and makes changes
that did not get committed in 2fedba9a32d9e92344eaf6e9faf5b43e1bc2ae70.
Bug: 183411356
Test: aapt2_test
Change-Id: Ieff9166100019f38ddcfe900014709b15db24e43
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/aapt2/format/binary/BinaryResourceParser.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/aapt2/format/binary/BinaryResourceParser.cpp b/tools/aapt2/format/binary/BinaryResourceParser.cpp index 2ec01cd1f4b8..72eaa3561a02 100644 --- a/tools/aapt2/format/binary/BinaryResourceParser.cpp +++ b/tools/aapt2/format/binary/BinaryResourceParser.cpp @@ -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) |