commit d3edfde51bd069a63e820282421d1a534fcf00ce
author Adam Lesinski <adamlesinski@google.com> Fri Aug 08 17:32:44 2014 -0700
committer Adam Lesinski <adamlesinski@google.com> Fri Aug 15 15:53:35 2014 -0700
tree 9974d53c7ff2edc8577fd45066844de166fae7ed
parent 4482e4bb8d1f5fe586b641bc3d6298dc7b8fee80

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

tools/aapt/Command.cpp

diff --git a/tools/aapt/Command.cpp b/tools/aapt/Command.cpp
index 41102fe..3738a29 100644
--- a/tools/aapt/Command.cpp
+++ b/tools/aapt/Command.cpp
@@ -1676,12 +1676,8 @@
 
                         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 == "") {