diff options
| author | 2014-01-31 13:46:08 +0000 | |
|---|---|---|
| committer | 2014-01-31 13:46:08 +0000 | |
| commit | acda961446f52b555d9c38757a68b5b15d26fd0b (patch) | |
| tree | f68a7673aafc66d89c1185a0df9b0a7a9d911ed5 /tools/aapt/AaptAssets.cpp | |
| parent | ca821336bdec3f1931f399e2a38e4171f92069a3 (diff) | |
| parent | 00b314436f4fdfada4bbf1e79ec12e9fa38aeaf1 (diff) | |
Merge "Change ResourceType cookies to int32_t."
Diffstat (limited to 'tools/aapt/AaptAssets.cpp')
| -rw-r--r-- | tools/aapt/AaptAssets.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/aapt/AaptAssets.cpp b/tools/aapt/AaptAssets.cpp index f11e9c20b464..e412c2732c20 100644 --- a/tools/aapt/AaptAssets.cpp +++ b/tools/aapt/AaptAssets.cpp @@ -2654,7 +2654,7 @@ status_t AaptAssets::addIncludedResources(const sp<AaptFile>& file) { const ResTable& res = getIncludedResources(); // XXX dirty! - return const_cast<ResTable&>(res).add(file->getData(), file->getSize(), NULL); + return const_cast<ResTable&>(res).add(file->getData(), file->getSize()); } const ResTable& AaptAssets::getIncludedResources() const |