summaryrefslogtreecommitdiff
path: root/tools/aapt2/ResourceParser.h
diff options
context:
space:
mode:
author Xin Li <delphij@google.com> 2024-12-13 17:29:18 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2024-12-13 17:29:18 -0800
commit7b1f850c50427ff38c20c83721c2e7aa173e62c2 (patch)
tree92f02a12a16318cde6d9a3b3761ca2c0040ce557 /tools/aapt2/ResourceParser.h
parent3f4c4881a31f0a24979df539b9d1e9c557a3619d (diff)
parent10e260fc86f8b879e9a88610994344f30bea7520 (diff)
Merge "Merge 24Q4 into AOSP main" into main
Diffstat (limited to 'tools/aapt2/ResourceParser.h')
-rw-r--r--tools/aapt2/ResourceParser.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/tools/aapt2/ResourceParser.h b/tools/aapt2/ResourceParser.h
index 012a056dccf3..442dea89ef40 100644
--- a/tools/aapt2/ResourceParser.h
+++ b/tools/aapt2/ResourceParser.h
@@ -27,6 +27,7 @@
#include "androidfw/IDiagnostics.h"
#include "androidfw/StringPiece.h"
#include "androidfw/StringPool.h"
+#include "cmd/Util.h"
#include "xml/XmlPullParser.h"
namespace aapt {
@@ -54,6 +55,8 @@ struct ResourceParserOptions {
// If visibility was forced, we need to use it when creating a new resource and also error if we
// try to parse the <public>, <public-group>, <java-symbol> or <symbol> tags.
std::optional<Visibility::Level> visibility;
+
+ FeatureFlagValues feature_flag_values;
};
struct FlattenedXmlSubTree {
@@ -82,6 +85,8 @@ class ResourceParser {
private:
DISALLOW_COPY_AND_ASSIGN(ResourceParser);
+ std::optional<FlagStatus> GetFlagStatus(xml::XmlPullParser* parser);
+
std::optional<FlattenedXmlSubTree> CreateFlattenSubTree(xml::XmlPullParser* parser);
// Parses the XML subtree as a StyleString (flattened XML representation for strings with