From 73a05114b051c6dcf5e5126ac94eaf8cac0ab289 Mon Sep 17 00:00:00 2001 From: Adam Lesinski Date: Mon, 8 Dec 2014 12:53:17 -0800 Subject: AAPT: Dump status of required flag for uses-feature Outside of a feature-group, the legacy uses-feature tag has a boolean required flag that should be emitted in dump badging. Bug:17790999 Change-Id: I43023af00e9c9ed4bc35795c3a983fc719bf9b7a --- tools/aapt/Command.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'tools/aapt') diff --git a/tools/aapt/Command.cpp b/tools/aapt/Command.cpp index f5f70c5..d23b82e 100644 --- a/tools/aapt/Command.cpp +++ b/tools/aapt/Command.cpp @@ -516,12 +516,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()); } @@ -1844,7 +1842,7 @@ int doDump(Bundle* bundle) } } - if (!grp.features.isEmpty()) { + if (!grp.features.isEmpty()) { printFeatureGroup(grp); } } -- cgit v1.1