diff options
| author | Colin Cross <ccross@android.com> | 2015-04-08 17:29:00 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2015-04-08 17:48:23 -0700 |
| commit | 01f185633c1c12017731336e7f926fe398c69781 (patch) | |
| tree | ab1546ae2c5ba5756df24bbe4a5dc3629ac04a9c /tools/aapt/ResourceTable.cpp | |
| parent | dbd9a4b651aed25a50976ca0a68a979cc3f299fa (diff) | |
| download | frameworks_base-01f185633c1c12017731336e7f926fe398c69781.zip frameworks_base-01f185633c1c12017731336e7f926fe398c69781.tar.gz frameworks_base-01f185633c1c12017731336e7f926fe398c69781.tar.bz2 | |
Re-enable -Wall and -Werror that were lost in a merge
-Wall and -Werror were lost during a merge when they were added to
aaptCFLAGS instead of aaptCFlags. Fix the typo, and the warnings
that crept in while it was disabled.
Change-Id: Ib944b8d6149278e4f3861c1acac277bcd95cc7c2
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 941a288..585a6de 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) { |