diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2017-01-31 13:47:27 -0800 |
|---|---|---|
| committer | Adam Lesinski <adamlesinski@google.com> | 2017-02-01 15:28:23 -0800 |
| commit | 86d67df8d57b9537666f9b54a9ca563779a2288b (patch) | |
| tree | d7498429238104f724b28ff68a84e7deeebef8af /tools/aapt2/ResourceParser.h | |
| parent | a9285db08883dbbe7b5eb9276cb52b7e01b42aa3 (diff) | |
AAPT2: Support CtsContentTestCases build
- Add <feature-group> to ManifestFixer.
- Support <meta-data> in <instrumentation>
- Add support for <bag> and type="configVarying". Some CTS tests use this
old notation, we need to support it (even though configVarying isn't
anything supported by the framework convention).
Change-Id: I6946fa633ce513ea8437c1496db883cf27dcf6de
Test: make aapt2_tests
Diffstat (limited to 'tools/aapt2/ResourceParser.h')
| -rw-r--r-- | tools/aapt2/ResourceParser.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/aapt2/ResourceParser.h b/tools/aapt2/ResourceParser.h index c12dacf1c707..cc0fa26f44d5 100644 --- a/tools/aapt2/ResourceParser.h +++ b/tools/aapt2/ResourceParser.h @@ -102,7 +102,8 @@ class ResourceParser { bool weak); Maybe<Attribute::Symbol> ParseEnumOrFlagItem(xml::XmlPullParser* parser, const android::StringPiece& tag); - bool ParseStyle(xml::XmlPullParser* parser, ParsedResource* out_resource); + bool ParseStyle(const ResourceType type, xml::XmlPullParser* parser, + ParsedResource* out_resource); bool ParseStyleItem(xml::XmlPullParser* parser, Style* style); bool ParseDeclareStyleable(xml::XmlPullParser* parser, ParsedResource* out_resource); |