diff options
| author | 2023-08-25 12:59:08 -0700 | |
|---|---|---|
| committer | 2023-08-25 12:59:08 -0700 | |
| commit | 7d3ffbae618e9e728644a96647ed709bf39ae759 (patch) | |
| tree | ab369a30c6a0e17a69c8f80c6353be4de3692e10 /tools/aapt/ResourceTable.cpp | |
| parent | a8a87bbca9162af7add830139198c4ee899fa123 (diff) | |
| parent | 8a809c6e46007521f75ac035ad4b1dcc1d00d9cf (diff) | |
Merge Android U (ab/10368041)
Bug: 291102124
Merged-In: I3c9e9d15786fbead1b874636b46844f6c24bccc2
Change-Id: Id6cf6cc13baef4e67486c6271a1510146204affa
Diffstat (limited to 'tools/aapt/ResourceTable.cpp')
| -rw-r--r-- | tools/aapt/ResourceTable.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/aapt/ResourceTable.cpp b/tools/aapt/ResourceTable.cpp index b6a17eb3e684..449e0808806e 100644 --- a/tools/aapt/ResourceTable.cpp +++ b/tools/aapt/ResourceTable.cpp @@ -3744,15 +3744,15 @@ ssize_t ResourceTable::Entry::flatten(Bundle* /* bundle */, const sp<AaptFile>& size_t amt = 0; ResTable_entry header; memset(&header, 0, sizeof(header)); - header.size = htods(sizeof(header)); + header.full.size = htods(sizeof(header)); const type ty = mType; if (ty == TYPE_BAG) { - header.flags |= htods(header.FLAG_COMPLEX); + header.full.flags |= htods(header.FLAG_COMPLEX); } if (isPublic) { - header.flags |= htods(header.FLAG_PUBLIC); + header.full.flags |= htods(header.FLAG_PUBLIC); } - header.key.index = htodl(mNameIndex); + header.full.key.index = htodl(mNameIndex); if (ty != TYPE_BAG) { status_t err = data->writeData(&header, sizeof(header)); if (err != NO_ERROR) { |