diff options
| author | 2014-10-01 23:38:25 +0000 | |
|---|---|---|
| committer | 2014-10-01 23:38:25 +0000 | |
| commit | 1dcc75b2dbaef7c3bb3410187bf38cabca0d1aea (patch) | |
| tree | b157e243e2c89f0899a862c99595ebeea9e54e5c /tools/aapt/AaptAssets.cpp | |
| parent | fe50cfd53309af4dd49e572bd4a3120ea1494029 (diff) | |
| parent | 0ce259c2f69cefd09342a95fbbd4c1a63a0af484 (diff) | |
am 0ce259c2: Merge "Frameworks/base: Fix AAPT warnings"
* commit '0ce259c2f69cefd09342a95fbbd4c1a63a0af484':
Frameworks/base: Fix AAPT warnings
Diffstat (limited to 'tools/aapt/AaptAssets.cpp')
| -rw-r--r-- | tools/aapt/AaptAssets.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/tools/aapt/AaptAssets.cpp b/tools/aapt/AaptAssets.cpp index 19532e8291f8..d8e2de659f48 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 @@ AaptGroupEntry::initFromDirName(const char* dir, String8* resType) String8 uiModeType, uiModeNight, smallestwidthdp, widthdp, heightdp; AaptLocaleValue locale; - int numLocaleComponents = 0; const int N = parts.size(); int index = 0; @@ -2538,7 +2536,7 @@ bail: } ssize_t -AaptAssets::slurpResourceZip(Bundle* bundle, const char* filename) +AaptAssets::slurpResourceZip(Bundle* /* bundle */, const char* filename) { int count = 0; SortedVector<AaptGroupEntry> entries; |