diff options
| author | 2014-01-27 12:04:30 +0000 | |
|---|---|---|
| committer | 2014-01-27 12:04:30 +0000 | |
| commit | 30e20ac528731a778eec45506d1e57c8839b318a (patch) | |
| tree | 98ef57ffe9bc61900414bc35f3d5b7a237c48220 /tools/aapt/Command.cpp | |
| parent | d4b688cf97736eb4c543149686ab851b9ea21161 (diff) | |
| parent | ebd43d46ebf53005ae60af59948f8ed634f9bafb (diff) | |
am ebd43d46: am dff83e2b: am d5970e9c: Merge "AssetManager cookies should be int32_t and not void*."
* commit 'ebd43d46ebf53005ae60af59948f8ed634f9bafb':
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; |