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/Resource.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/Resource.cpp')
| -rw-r--r-- | tools/aapt/Resource.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/aapt/Resource.cpp b/tools/aapt/Resource.cpp index 8f43661ceef8..a390e42b46e4 100644 --- a/tools/aapt/Resource.cpp +++ b/tools/aapt/Resource.cpp @@ -1320,7 +1320,7 @@ status_t buildResources(Bundle* bundle, const sp<AaptAssets>& assets) } // Read resources back in, - finalResTable.add(resFile->getData(), resFile->getSize(), NULL); + finalResTable.add(resFile->getData(), resFile->getSize()); #if 0 NOISY( |