diff options
| author | Narayan Kamath <narayan@google.com> | 2014-01-31 14:13:47 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-01-31 14:13:48 +0000 |
| commit | 1cadc07dd1e3711fb1e57548038e3026682c5ef8 (patch) | |
| tree | 5c4ba71ffa68a8094c3849dafa7126d6b6da88f2 /tools/aapt/Resource.cpp | |
| parent | b9f960e094d53440be5c7e8759a74dbb0ab57317 (diff) | |
| parent | 7c4887f66bfa3dad16f8b03dc825ade96d7de130 (diff) | |
| download | frameworks_base-1cadc07dd1e3711fb1e57548038e3026682c5ef8.zip frameworks_base-1cadc07dd1e3711fb1e57548038e3026682c5ef8.tar.gz frameworks_base-1cadc07dd1e3711fb1e57548038e3026682c5ef8.tar.bz2 | |
Merge "Change ResourceType cookies to int32_t."
Diffstat (limited to 'tools/aapt/Resource.cpp')
| -rw-r--r-- | tools/aapt/Resource.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
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"); |