diff options
| author | 2014-08-08 17:32:44 -0700 | |
|---|---|---|
| committer | 2014-08-15 15:53:35 -0700 | |
| commit | d3edfde51bd069a63e820282421d1a534fcf00ce (patch) | |
| tree | 9974d53c7ff2edc8577fd45066844de166fae7ed /tools/aapt/Command.cpp | |
| parent | 4482e4bb8d1f5fe586b641bc3d6298dc7b8fee80 (diff) | |
Add FeatureGroup to PackageInfo
FeatureGroups replace top-level FeatureInfo objects.
FeatureGroups inherit top-level FeatureInfos but override
them if the feature names are the same.
Bug:16822121
Change-Id: I80b2cb778a0fbcb4521efce986fba641e0914290
Diffstat (limited to 'tools/aapt/Command.cpp')
| -rw-r--r-- | tools/aapt/Command.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/tools/aapt/Command.cpp b/tools/aapt/Command.cpp index 41102fe7491d..3738a29e7a5a 100644 --- a/tools/aapt/Command.cpp +++ b/tools/aapt/Command.cpp @@ -1676,12 +1676,8 @@ int doDump(Bundle* bundle) String8 name = getResolvedAttribute(&res, tree, NAME_ATTR, &error); if (name != "" && error == "") { - int required = getIntegerAttribute(tree, REQUIRED_ATTR, NULL, 1); - top.features.add(name, required); - if (required) { - addParentFeatures(&top, name); - } - + top.features.add(name, true); + addParentFeatures(&top, name); } else { int vers = getIntegerAttribute(tree, GL_ES_VERSION_ATTR, &error); if (error == "") { |