diff options
| author | 2015-04-08 17:29:00 -0700 | |
|---|---|---|
| committer | 2015-04-08 17:48:23 -0700 | |
| commit | 01f185633c1c12017731336e7f926fe398c69781 (patch) | |
| tree | ab1546ae2c5ba5756df24bbe4a5dc3629ac04a9c /tools/aapt/Resource.cpp | |
| parent | dbd9a4b651aed25a50976ca0a68a979cc3f299fa (diff) | |
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/Resource.cpp')
| -rw-r--r-- | tools/aapt/Resource.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tools/aapt/Resource.cpp b/tools/aapt/Resource.cpp index 36299c2c3a5b..a6b862eaa3a0 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; |