diff options
| author | 2014-01-27 11:56:03 +0000 | |
|---|---|---|
| committer | 2014-01-27 11:56:03 +0000 | |
| commit | d5970e9ca34038051f694c7349fa5f3548ee9499 (patch) | |
| tree | 91eab9b69a5eb82352b15c2f16313894e22a85ab /tools/aapt/Command.cpp | |
| parent | d1eeb6747820f549ec724546a84e3860b4580587 (diff) | |
| parent | 745d4efc8369d255341d810790132660e33d3b61 (diff) | |
Merge "AssetManager cookies should be int32_t and not void*."
Diffstat (limited to 'tools/aapt/Command.cpp')
| -rw-r--r-- | tools/aapt/Command.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/aapt/Command.cpp b/tools/aapt/Command.cpp index 632efe04f3c2..8a6faed585a2 100644 --- a/tools/aapt/Command.cpp +++ b/tools/aapt/Command.cpp @@ -505,7 +505,7 @@ int doDump(Bundle* bundle) const char* filename = bundle->getFileSpecEntry(1); AssetManager assets; - void* assetsCookie; + int32_t assetsCookie; if (!assets.addAssetPath(String8(filename), &assetsCookie)) { fprintf(stderr, "ERROR: dump failed because assets could not be loaded\n"); return 1; |