diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2015-12-09 15:20:52 -0800 |
|---|---|---|
| committer | Adam Lesinski <adamlesinski@google.com> | 2015-12-10 16:24:15 -0800 |
| commit | a6fe345be955368a13aea76aefb4db821aad11df (patch) | |
| tree | c5385f798a6e1fb674f6f13c0f323726258618ca /tools/aapt2/ResourceParser.h | |
| parent | 01655232371d7c7ea5b58ccf66ad99917072018a (diff) | |
AAPT2: Fix overlay support
Supports the <add-resource> tag and mimics old AAPT behavior of
not allowing new resources defined unless <add-resource> was used
or --auto-add-overlay was specified.
Change-Id: I9b461137357617ade37fd7045b418b8e6450b9c4
Diffstat (limited to 'tools/aapt2/ResourceParser.h')
| -rw-r--r-- | tools/aapt2/ResourceParser.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/aapt2/ResourceParser.h b/tools/aapt2/ResourceParser.h index 1150758b930e..04db5778a456 100644 --- a/tools/aapt2/ResourceParser.h +++ b/tools/aapt2/ResourceParser.h @@ -83,7 +83,9 @@ private: bool parsePrimitive(xml::XmlPullParser* parser, ParsedResource* outResource); bool parsePublic(xml::XmlPullParser* parser, ParsedResource* outResource); bool parsePublicGroup(xml::XmlPullParser* parser, ParsedResource* outResource); + bool parseSymbolImpl(xml::XmlPullParser* parser, ParsedResource* outResource); bool parseSymbol(xml::XmlPullParser* parser, ParsedResource* outResource); + bool parseAddResource(xml::XmlPullParser* parser, ParsedResource* outResource); bool parseAttr(xml::XmlPullParser* parser, ParsedResource* outResource); bool parseAttrImpl(xml::XmlPullParser* parser, ParsedResource* outResource, bool weak); Maybe<Attribute::Symbol> parseEnumOrFlagItem(xml::XmlPullParser* parser, |