summaryrefslogtreecommitdiff
path: root/libs/utils/AssetManager.cpp
diff options
context:
space:
mode:
author Kenny Root <kroot@google.com> 2010-05-12 14:55:56 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-05-12 14:55:56 -0700
commitd6effb069656add955790a85eaeb556e724dfc7e (patch)
tree54b8857783ced454e0b05b185753a652d4899b37 /libs/utils/AssetManager.cpp
parentfe953c4381f1b0f523ece55753a442eb8665d669 (diff)
parente8621534db97070cc40f729d1eb8074f2e69df9d (diff)
am e8621534: Merge "ZipUtilsRO rewrite based on Dalvik Zip rewrite" into kraken
Diffstat (limited to 'libs/utils/AssetManager.cpp')
-rw-r--r--libs/utils/AssetManager.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/utils/AssetManager.cpp b/libs/utils/AssetManager.cpp
index 5a05e6a61f17..60a0d82e255d 100644
--- a/libs/utils/AssetManager.cpp
+++ b/libs/utils/AssetManager.cpp
@@ -824,7 +824,7 @@ Asset* AssetManager::openAssetFromZipLocked(const ZipFileRO* pZipFile,
// TODO: look for previously-created shared memory slice?
int method;
- long uncompressedLen;
+ size_t uncompressedLen;
//printf("USING Zip '%s'\n", pEntry->getFileName());