commit 2412f84064c26b643c722ce914a97c4ec7776c69
author Andreas Gampe <agampe@google.com> Tue Sep 30 20:55:57 2014 -0700
committer Andreas Gampe <agampe@google.com> Wed Oct 01 16:18:06 2014 -0700
tree 978c6b2e82fceee9153ffe612cfbb67e4b1b8c57
parent c46dbe8ac4748a0084b026524ad9e5ac44fb9fde

Frameworks/base: Fix AAPT warnings

Turn on -Wall -Werror. Fix warnings.

Change-Id: I287fb3c1e851c654479bcf9ea8c73bd354a6b2a1

tools/aapt/AaptAssets.cpp

diff --git a/tools/aapt/AaptAssets.cpp b/tools/aapt/AaptAssets.cpp
index 19532e8..d8e2de6 100644
--- a/tools/aapt/AaptAssets.cpp
+++ b/tools/aapt/AaptAssets.cpp
@@ -13,7 +13,6 @@
 #include <dirent.h>
 #include <errno.h>
 
-static const char* kDefaultLocale = "default";
 static const char* kWildcardName = "any";
 static const char* kAssetDir = "assets";
 static const char* kResourceDir = "res";
@@ -679,7 +678,6 @@
     String8 uiModeType, uiModeNight, smallestwidthdp, widthdp, heightdp;
 
     AaptLocaleValue locale;
-    int numLocaleComponents = 0;
 
     const int N = parts.size();
     int index = 0;
@@ -2538,7 +2536,7 @@
 }
 
 ssize_t
-AaptAssets::slurpResourceZip(Bundle* bundle, const char* filename)
+AaptAssets::slurpResourceZip(Bundle* /* bundle */, const char* filename)
 {
     int count = 0;
     SortedVector<AaptGroupEntry> entries;