Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit 'fbba9b57a35da49e592756ef86f98535280c0d09':
  AAPT: Dump status of required flag for uses-feature
This commit is contained in:
Adam Lesinski
2014-12-09 00:37:54 +00:00
committed by Android Git Automerger
parent 4b944f3ab8 fbba9b57a3
commit c765655ae1
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tools/aapt/Command.cpp
View File

@@ -516,12 +516,10 @@ static void printFeatureGroup(const FeatureGroup& grp,
const size_t numFeatures = grp.features.size(); const size_t numFeatures = grp.features.size();
for (size_t i = 0; i < numFeatures; i++) { for (size_t i = 0; i < numFeatures; i++) {
if (!grp.features[i]) { const bool required = grp.features[i];
continue;
}
const String8& featureName = grp.features.keyAt(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()); ResTable::normalizeForOutput(featureName.string()).string());
} }
@@ -1844,7 +1842,7 @@ int doDump(Bundle* bundle)
} }
} }
if (!grp.features.isEmpty()) { if (!grp.features.isEmpty()) {
printFeatureGroup(grp); printFeatureGroup(grp);
} }
} }