diff options
| author | Narayan Kamath <narayan@google.com> | 2014-03-07 00:37:56 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-07 00:37:56 +0000 |
| commit | 02054534b15862282292196a9778f63990ff2d9b (patch) | |
| tree | 44ef37fc32cea41556e9f895b5e81c86e2301a84 /tools | |
| parent | 364d8180d51b7960e922baebb730892a169dfa36 (diff) | |
| parent | 9af955744d4e0d82b61fc99a932b9a5cf28b5df7 (diff) | |
| download | frameworks_base-02054534b15862282292196a9778f63990ff2d9b.zip frameworks_base-02054534b15862282292196a9778f63990ff2d9b.tar.gz frameworks_base-02054534b15862282292196a9778f63990ff2d9b.tar.bz2 | |
am 9af95574: am 1cadc07d: Merge "Change ResourceType cookies to int32_t."
* commit '9af955744d4e0d82b61fc99a932b9a5cf28b5df7':
Change ResourceType cookies to int32_t.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/aapt/AaptAssets.cpp | 2 | ||||
| -rw-r--r-- | tools/aapt/Resource.cpp | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/tools/aapt/AaptAssets.cpp b/tools/aapt/AaptAssets.cpp index d8e113a..ebf4538 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 diff --git a/tools/aapt/Resource.cpp b/tools/aapt/Resource.cpp index 386888b..57d44f2 100644 --- a/tools/aapt/Resource.cpp +++ b/tools/aapt/Resource.cpp @@ -1320,8 +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( printf("Generated resources:\n"); |