diff options
author | Adam Lesinski <adamlesinski@google.com> | 2014-08-15 23:06:22 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-15 18:56:10 +0000 |
commit | 91306bccf16715f0867a10f3537122179527f7c3 (patch) | |
tree | ef5549f0bc7fe80ec06ff86c956e8c898fac645c /tools/aapt/Command.cpp | |
parent | 3e3b251f46f6ec46a41d42eb7c36a6268096c70d (diff) | |
parent | d3edfde51bd069a63e820282421d1a534fcf00ce (diff) |
Merge "Add FeatureGroup to PackageInfo" into lmp-dev
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 c74a3730bcba..fe0a601f8f9c 100644 --- a/tools/aapt/Command.cpp +++ b/tools/aapt/Command.cpp @@ -1673,12 +1673,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 == "") { |