diff options
| author | 2018-11-16 11:21:41 -0800 | |
|---|---|---|
| committer | 2018-12-11 13:48:45 -0800 | |
| commit | 1bb1fe068a7e719711963c3cf3a50209e083a17f (patch) | |
| tree | 70a6d9fbaa6e7f03626b92d345f73b48fcc3fa4a /tools/aapt2/ResourceParser.h | |
| parent | c622083df99a87afef8348dd8e4bdfecf3050d94 (diff) | |
Refactor policy parsing
This change removes the ability for an overlayable resource to be
defined in multiple policy blocks within the same overlayable. This
change also changes aapt2 to use a bit mask to keep track of the parsed
policies.
Bug: 110869880
Bug: 120298168
Test: aapt2_tests
Change-Id: Ie26cd913f94a16c0b312f222bccfa48f62feceaa
Diffstat (limited to 'tools/aapt2/ResourceParser.h')
| -rw-r--r-- | tools/aapt2/ResourceParser.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/tools/aapt2/ResourceParser.h b/tools/aapt2/ResourceParser.h index ebacd6f1280e..06bb0c9cf264 100644 --- a/tools/aapt2/ResourceParser.h +++ b/tools/aapt2/ResourceParser.h @@ -96,10 +96,6 @@ class ResourceParser { bool ParseSymbolImpl(xml::XmlPullParser* parser, ParsedResource* out_resource); bool ParseSymbol(xml::XmlPullParser* parser, ParsedResource* out_resource); bool ParseOverlayable(xml::XmlPullParser* parser, ParsedResource* out_resource); - bool ParseOverlayableItem(xml::XmlPullParser* parser, - const std::vector<Overlayable::Policy>& policies, - const std::string& comment, - ParsedResource* out_resource); bool ParseAddResource(xml::XmlPullParser* parser, ParsedResource* out_resource); bool ParseAttr(xml::XmlPullParser* parser, ParsedResource* out_resource); bool ParseAttrImpl(xml::XmlPullParser* parser, ParsedResource* out_resource, bool weak); |