diff options
| author | Colin Cross <ccross@android.com> | 2015-04-09 00:49:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-04-09 00:49:56 +0000 |
| commit | 1be312dfb02e86731da6ac54a39956db791f4978 (patch) | |
| tree | 47a4996e85d477e1448a40a0ad486ce11cdbbd23 /tools/aapt | |
| parent | e8a3c320e658f6c7f8d1db3d8ad3c3f189c0f54e (diff) | |
| parent | 01f185633c1c12017731336e7f926fe398c69781 (diff) | |
| download | frameworks_base-1be312dfb02e86731da6ac54a39956db791f4978.zip frameworks_base-1be312dfb02e86731da6ac54a39956db791f4978.tar.gz frameworks_base-1be312dfb02e86731da6ac54a39956db791f4978.tar.bz2 | |
Merge "Re-enable -Wall and -Werror that were lost in a merge"
Diffstat (limited to 'tools/aapt')
| -rw-r--r-- | tools/aapt/Android.mk | 2 | ||||
| -rw-r--r-- | tools/aapt/Images.cpp | 1 | ||||
| -rw-r--r-- | tools/aapt/Resource.cpp | 1 | ||||
| -rw-r--r-- | tools/aapt/ResourceTable.cpp | 3 |
4 files changed, 2 insertions, 5 deletions
diff --git a/tools/aapt/Android.mk b/tools/aapt/Android.mk index c5495a5..9956bd7 100644 --- a/tools/aapt/Android.mk +++ b/tools/aapt/Android.mk @@ -67,7 +67,7 @@ aaptHostStaticLibs := \ libziparchive-host aaptCFlags := -DAAPT_VERSION=\"$(BUILD_NUMBER)\" -aaptCFLAGS += -Wall -Werror +aaptCFlags += -Wall -Werror ifeq ($(HOST_OS),linux) aaptHostLdLibs += -lrt -ldl -lpthread diff --git a/tools/aapt/Images.cpp b/tools/aapt/Images.cpp index 063b4e6..e4738f5 100644 --- a/tools/aapt/Images.cpp +++ b/tools/aapt/Images.cpp @@ -412,7 +412,6 @@ static void find_max_opacity(png_byte** rows, int startX, int startY, int endX, int endY, int dX, int dY, int* out_inset) { - bool opaque_within_inset = true; uint8_t max_opacity = 0; int inset = 0; *out_inset = 0; diff --git a/tools/aapt/Resource.cpp b/tools/aapt/Resource.cpp index 38d10cf..beb94fd 100644 --- a/tools/aapt/Resource.cpp +++ b/tools/aapt/Resource.cpp @@ -3056,7 +3056,6 @@ writeProguardForLayouts(ProguardKeepSet* keep, const sp<AaptAssets>& assets) const sp<AaptDir>& d = dirs.itemAt(k); const String8& dirName = d->getLeaf(); Vector<String8> startTags; - const char* startTag = NULL; const KeyedVector<String8, Vector<NamespaceAttributePair> >* tagAttrPairs = NULL; if ((dirName == String8("layout")) || (strncmp(dirName.string(), "layout-", 7) == 0)) { tagAttrPairs = &kLayoutTagAttrPairs; diff --git a/tools/aapt/ResourceTable.cpp b/tools/aapt/ResourceTable.cpp index 24f8168..c5fccbf 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) { |