diff options
| author | 2015-04-09 01:23:28 +0000 | |
|---|---|---|
| committer | 2015-04-09 01:23:28 +0000 | |
| commit | 106f83ee9cc145a6421d21067c44b513cc148e80 (patch) | |
| tree | 2b9cef955eef793ca9f0ee231330dd7830ca78fb /tools/aapt/ResourceTable.cpp | |
| parent | 33a68a521f77a2070832ece271d1047ecf56de7e (diff) | |
| parent | 4cead39a178dd8c4d7c1397e6ad5b861b08125b7 (diff) | |
am 4cead39a: am 1be312df: Merge "Re-enable -Wall and -Werror that were lost in a merge"
* commit '4cead39a178dd8c4d7c1397e6ad5b861b08125b7':
Re-enable -Wall and -Werror that were lost in a merge
Diffstat (limited to 'tools/aapt/ResourceTable.cpp')
| -rw-r--r-- | tools/aapt/ResourceTable.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tools/aapt/ResourceTable.cpp b/tools/aapt/ResourceTable.cpp index 24f8168cf79e..c5fccbf02914 100644 --- a/tools/aapt/ResourceTable.cpp +++ b/tools/aapt/ResourceTable.cpp @@ -3167,7 +3167,7 @@ status_t ResourceTable::flatten(Bundle* bundle, const sp<const ResourceFilter>& if (!validResources[i]) { sp<ConfigList> c = t->getOrderedConfigs().itemAt(i); if (c != NULL) { - fprintf(stderr, "%s: no entries written for %s/%s (0x%08x)\n", log_prefix, + fprintf(stderr, "%s: no entries written for %s/%s (0x%08zx)\n", log_prefix, String8(typeName).string(), String8(c->getName()).string(), Res_MAKEID(p->getAssignedId() - 1, ti, i)); } @@ -4526,7 +4526,6 @@ status_t ResourceTable::modifyForCompat(const Bundle* bundle) { const KeyedVector<String16, Item>& bag = e->getBag(); const size_t bagCount = bag.size(); for (size_t bi = 0; bi < bagCount; bi++) { - const Item& item = bag.valueAt(bi); const uint32_t attrId = getResId(bag.keyAt(bi), &attr16); const int sdkLevel = getPublicAttributeSdkLevel(attrId); if (sdkLevel > 1 && sdkLevel > config.sdkVersion && sdkLevel > minSdk) { |