summaryrefslogtreecommitdiff
path: root/tools/aapt/Command.cpp
diff options
context:
space:
mode:
authorNarayan Kamath <narayan@google.com>2014-01-24 14:14:30 +0000
committerAdam Lesinski <adamlesinski@google.com>2014-01-27 10:31:11 -0800
commitf85e41f29a0e9313c2d4725f9d9648591ea49f3b (patch)
tree1756c780ff79f24e887b798c67389380af2a7e0c /tools/aapt/Command.cpp
parentca0b0c18e7eef130e40679b0e77bbcd9a8c901cc (diff)
AssetManager cookies are now int32_t, not void*.
Change-Id: Id383e31922ca81c52dad52d422c5c1ab1a1365ce
Diffstat (limited to 'tools/aapt/Command.cpp')
-rw-r--r--tools/aapt/Command.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/aapt/Command.cpp b/tools/aapt/Command.cpp
index 02c3f94dafd0..c527388de59b 100644
--- a/tools/aapt/Command.cpp
+++ b/tools/aapt/Command.cpp
@@ -588,7 +588,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;