diff options
| author | Narayan Kamath <narayan@google.com> | 2014-01-27 04:01:15 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-01-27 04:01:15 -0800 |
| commit | ebd43d46ebf53005ae60af59948f8ed634f9bafb (patch) | |
| tree | 736885eba35ebf5adea0c2237263220c3c847f51 /tools | |
| parent | d165f365b394b7632d8a0cfbc14bbf4004858333 (diff) | |
| parent | dff83e2b121b356a264e908f8a7d64584eab9b73 (diff) | |
| download | frameworks_base-ebd43d46ebf53005ae60af59948f8ed634f9bafb.zip frameworks_base-ebd43d46ebf53005ae60af59948f8ed634f9bafb.tar.gz frameworks_base-ebd43d46ebf53005ae60af59948f8ed634f9bafb.tar.bz2 | |
am dff83e2b: am d5970e9c: Merge "AssetManager cookies should be int32_t and not void*."
* commit 'dff83e2b121b356a264e908f8a7d64584eab9b73':
AssetManager cookies should be int32_t and not void*.
Diffstat (limited to 'tools')
| -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 632efe0..8a6faed 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; |