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/Resource.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/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; |