diff options
| author | 2014-10-01 23:34:43 -0700 | |
|---|---|---|
| committer | 2014-10-01 23:35:41 -0700 | |
| commit | 8daabceb2efddebe2e7c0b2425ad9f8ef62c0a5c (patch) | |
| tree | 230e918cee633aa61318edf50e902c44e4a84fde /tools/aapt/AaptAssets.cpp | |
| parent | 9f905f37b229294753ef08ee104a00f611de450f (diff) | |
| parent | 1dcc75b2dbaef7c3bb3410187bf38cabca0d1aea (diff) | |
resolved conflicts for merge of 1dcc75b2 to lmp-dev-plus-aosp
Change-Id: I8e1c6ee2025b6acd90803545fb95ab1b98560d92
Diffstat (limited to 'tools/aapt/AaptAssets.cpp')
| -rw-r--r-- | tools/aapt/AaptAssets.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tools/aapt/AaptAssets.cpp b/tools/aapt/AaptAssets.cpp index 117fc2435076..364830d86bda 100644 --- a/tools/aapt/AaptAssets.cpp +++ b/tools/aapt/AaptAssets.cpp @@ -15,7 +15,6 @@ #include <dirent.h> #include <errno.h> -static const char* kDefaultLocale = "default"; static const char* kAssetDir = "assets"; static const char* kResourceDir = "res"; static const char* kValuesDir = "values"; @@ -1240,7 +1239,7 @@ bail: } ssize_t -AaptAssets::slurpResourceZip(Bundle* bundle, const char* filename) +AaptAssets::slurpResourceZip(Bundle* /* bundle */, const char* filename) { int count = 0; SortedVector<AaptGroupEntry> entries; |