diff options
| author | Narayan Kamath <narayan@google.com> | 2014-01-27 17:32:37 +0000 |
|---|---|---|
| committer | Narayan Kamath <narayan@google.com> | 2014-01-31 13:47:27 +0000 |
| commit | 7c4887f66bfa3dad16f8b03dc825ade96d7de130 (patch) | |
| tree | 9ed404cd4e19d5a28b75fe132fae66bce4550276 /tools/aapt/Resource.cpp | |
| parent | e05b7b50e234e8ed2471f5ad96bb3d715067e9f3 (diff) | |
| download | frameworks_base-7c4887f66bfa3dad16f8b03dc825ade96d7de130.zip frameworks_base-7c4887f66bfa3dad16f8b03dc825ade96d7de130.tar.gz frameworks_base-7c4887f66bfa3dad16f8b03dc825ade96d7de130.tar.bz2 | |
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/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"); |