Merge "AAPT: Dump status of required flag for uses-feature" into lmp-mr1-dev

1 files changed, 3 insertions, 5 deletions

diff --git a/tools/aapt/Command.cpp b/tools/aapt/Command.cpp
index f5f70c5cf2ed..d23b82e50ecc 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);
                     }
                 }