summaryrefslogtreecommitdiff
path: root/tools/aapt2/Resource.h
diff options
context:
space:
mode:
authorAdam Lesinski <adamlesinski@google.com>2017-01-31 13:47:27 -0800
committerAdam Lesinski <adamlesinski@google.com>2017-02-01 15:28:23 -0800
commit86d67df8d57b9537666f9b54a9ca563779a2288b (patch)
treed7498429238104f724b28ff68a84e7deeebef8af /tools/aapt2/Resource.h
parenta9285db08883dbbe7b5eb9276cb52b7e01b42aa3 (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/Resource.h')
-rw-r--r--tools/aapt2/Resource.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/tools/aapt2/Resource.h b/tools/aapt2/Resource.h
index 1950ea35a652..4d915d9f23c0 100644
--- a/tools/aapt2/Resource.h
+++ b/tools/aapt2/Resource.h
@@ -44,6 +44,11 @@ enum class ResourceType {
kAttrPrivate,
kBool,
kColor,
+
+ // Not really a type, but it shows up in some CTS tests and
+ // we need to continue respecting it.
+ kConfigVarying,
+
kDimen,
kDrawable,
kFont,