diff options
| author | 2014-01-27 17:32:37 +0000 | |
|---|---|---|
| committer | 2014-01-28 16:27:52 +0000 | |
| commit | 00b314436f4fdfada4bbf1e79ec12e9fa38aeaf1 (patch) | |
| tree | d1d6075692ef537e80d05255a13204a61f0f8a04 /tools/aapt/AaptAssets.cpp | |
| parent | 729b12c7a91f9caa65af77197cf6a8814a5a2051 (diff) | |
Change ResourceType cookies to int32_t.
Also change the order of parameters in ResTable constructors
to avoid ambiguity.
Change-Id: If7bfa1f640dddca39b9f26a3ce84081fa7b6e6e3
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 |