diff options
author | Adam Lesinski <adamlesinski@google.com> | 2014-12-09 00:43:14 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-09 00:43:14 +0000 |
commit | 55188f591844ce34e9c1862f10a85d89fa20cb91 (patch) | |
tree | ee23a4d8dff7deef4b247a4c039d3c48b6e95134 | |
parent | 2bbf5575e71f414d7ad8333d5daeef13ace04cfa (diff) | |
parent | c765655ae1ae35f9d5f0958295f0b71270132ca7 (diff) | |
download | frameworks_base-55188f591844ce34e9c1862f10a85d89fa20cb91.zip frameworks_base-55188f591844ce34e9c1862f10a85d89fa20cb91.tar.gz frameworks_base-55188f591844ce34e9c1862f10a85d89fa20cb91.tar.bz2 |
am c765655a: am fbba9b57: Merge "AAPT: Dump status of required flag for uses-feature" into lmp-mr1-dev
* commit 'c765655ae1ae35f9d5f0958295f0b71270132ca7':
AAPT: Dump status of required flag for uses-feature
-rw-r--r-- | tools/aapt/Command.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/tools/aapt/Command.cpp b/tools/aapt/Command.cpp index b7484a3..f4581d0 100644 --- a/tools/aapt/Command.cpp +++ b/tools/aapt/Command.cpp @@ -517,12 +517,10 @@ static void printFeatureGroup(const FeatureGroup& grp, const size_t numFeatures = grp.features.size(); for (size_t i = 0; i < numFeatures; i++) { - if (!grp.features[i]) { - continue; - } + const bool required = grp.features[i]; const String8& featureName = grp.features.keyAt(i); - printf(" uses-feature: name='%s'\n", + printf(" uses-feature%s: name='%s'\n", (required ? "" : "-not-required"), ResTable::normalizeForOutput(featureName.string()).string()); } @@ -1842,7 +1840,7 @@ int doDump(Bundle* bundle) } } - if (!grp.features.isEmpty()) { + if (!grp.features.isEmpty()) { printFeatureGroup(grp); } } |