commit 74d2947f660fcba4681ce2b54e53bab13a09a30c
author Adam Lesinski <adamlesinski@google.com> Tue Dec 09 23:22:00 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Dec 09 23:22:00 2014 +0000
tree 3eda87366996e62c686062fb79578729c569ace6
parent 48614536a7d972e2fdf3a74900ce61f29847cfce
parent 55188f591844ce34e9c1862f10a85d89fa20cb91

am 55188f59: am c765655a: am fbba9b57: Merge "AAPT: Dump status of required flag for uses-feature" into lmp-mr1-dev

* commit '55188f591844ce34e9c1862f10a85d89fa20cb91':
  AAPT: Dump status of required flag for uses-feature

tools/aapt/Command.cpp

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 @@
 
     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 @@
                         }
                     }
 
-                   if (!grp.features.isEmpty()) {
+                    if (!grp.features.isEmpty()) {
                         printFeatureGroup(grp);
                     }
                 }