diff options
| author | 2014-01-27 17:32:37 +0000 | |
|---|---|---|
| committer | 2014-01-31 13:47:27 +0000 | |
| commit | 7c4887f66bfa3dad16f8b03dc825ade96d7de130 (patch) | |
| tree | 9ed404cd4e19d5a28b75fe132fae66bce4550276 /tools/aapt/AaptAssets.cpp | |
| parent | e05b7b50e234e8ed2471f5ad96bb3d715067e9f3 (diff) | |
Change ResourceType cookies to int32_t.
Also change the order of parameters in ResTable constructors
to avoid ambiguity.
(cherry picked from commit 00b314436f4fdfada4bbf1e79ec12e9fa38aeaf1)
Change-Id: I874c5d03c134dc3c331fba423b5280366296287c
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 d8e113a2d140..ebf45382af85 100644 --- a/tools/aapt/AaptAssets.cpp +++ b/tools/aapt/AaptAssets.cpp @@ -2651,7 +2651,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 |