diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2017-03-29 13:00:35 -0700 |
|---|---|---|
| committer | Adam Lesinski <adamlesinski@google.com> | 2017-03-29 20:11:04 +0000 |
| commit | 33af6c730f9f7fc51f04516c7a22cac82cb9823e (patch) | |
| tree | 94f834ef6df06b8b534cb3a053de308f74793a09 /tools/aapt2/Main.cpp | |
| parent | c463bed8dbfbb5bbac791299e8997282685e64d2 (diff) | |
AAPT2: Parse an ID encoded as a map
ID types should not be encoded as a map. AAPT and AAPT2 emit
IDs as boolean types.
Some apps exist that for some reason have their ID types encoded
as empty maps. This is the case only for the auto generated IDs
from enum values in <attr> tags.
Allow IDs as maps and ignore their content when processing an APK
for optimizing.
Also fixes an issue with expected size of the ResTable_package struct.
Bug: 35861796
Test: tested against the APK in b/35861796
Change-Id: I29a19cd9777bb10bed6766cd42e35e50e098797b
Diffstat (limited to 'tools/aapt2/Main.cpp')
| -rw-r--r-- | tools/aapt2/Main.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/aapt2/Main.cpp b/tools/aapt2/Main.cpp index 5e9b81a29af9..36c1de6a4f26 100644 --- a/tools/aapt2/Main.cpp +++ b/tools/aapt2/Main.cpp @@ -25,7 +25,7 @@ namespace aapt { static const char* sMajorVersion = "2"; // Update minor version whenever a feature or flag is added. -static const char* sMinorVersion = "11"; +static const char* sMinorVersion = "12"; int PrintVersion() { std::cerr << "Android Asset Packaging Tool (aapt) " << sMajorVersion << "." |