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/Resource.cpp | |
| parent | e8a3c320e658f6c7f8d1db3d8ad3c3f189c0f54e (diff) | |
| parent | 01f185633c1c12017731336e7f926fe398c69781 (diff) | |
Merge "Re-enable -Wall and -Werror that were lost in a merge"
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 38d10cf6529b..beb94fdbcfc5 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; |