diff options
| author | 2014-01-27 12:07:15 +0000 | |
|---|---|---|
| committer | 2014-01-27 12:07:15 +0000 | |
| commit | 1cd2834fde49738d9d884ed193bffa986224204d (patch) | |
| tree | 2d88b9fa7fa7931d938241f413ab6f575eccc0f2 /tools/aapt/Command.cpp | |
| parent | dafb2420a34a5b39aca6ddf993e86778edd76b5d (diff) | |
| parent | 30e20ac528731a778eec45506d1e57c8839b318a (diff) | |
am 30e20ac5: am ebd43d46: am dff83e2b: am d5970e9c: Merge "AssetManager cookies should be int32_t and not void*."
* commit '30e20ac528731a778eec45506d1e57c8839b318a':
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; |