commit f85e41f29a0e9313c2d4725f9d9648591ea49f3b
author Narayan Kamath <narayan@google.com> Fri Jan 24 14:14:30 2014 +0000
committer Adam Lesinski <adamlesinski@google.com> Mon Jan 27 10:31:11 2014 -0800
tree 1756c780ff79f24e887b798c67389380af2a7e0c
parent ca0b0c18e7eef130e40679b0e77bbcd9a8c901cc

AssetManager cookies are now int32_t, not void*.

Change-Id: Id383e31922ca81c52dad52d422c5c1ab1a1365ce

tools/aapt/Command.cpp

diff --git a/tools/aapt/Command.cpp b/tools/aapt/Command.cpp
index 02c3f94..c527388 100644
--- a/tools/aapt/Command.cpp
+++ b/tools/aapt/Command.cpp
@@ -588,7 +588,7 @@
     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;