diff options
| author | Narayan Kamath <narayan@google.com> | 2013-12-03 13:16:03 +0000 |
|---|---|---|
| committer | Narayan Kamath <narayan@google.com> | 2013-12-09 16:23:16 +0000 |
| commit | afd31e08299008fdc5c2813f21b2573f29dc53df (patch) | |
| tree | 7f83dd8f1e7ed71d4fe8ce280841e43ce275ac6d /libs/androidfw/Asset.cpp | |
| parent | 6e2d0c1d91f644ab50e0c0b7cae4306262a4ca41 (diff) | |
Reimplement ZipFileRO in terms of libziparchive.
This lets us share zip archive processing code with both
the runtime (Art, dalvik) and critical java code
(StrictJarFile).
This change also moves several utility methods to ZipUtils
and dedups code across several zip inflation methods.
One of the side effects of this change is that several
processing loops are now O(n) instead of O(n^2).
bug: 10193060
Change-Id: I3c7188496837a47246c4f342e45485a70fef3169
Diffstat (limited to 'libs/androidfw/Asset.cpp')
| -rw-r--r-- | libs/androidfw/Asset.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/androidfw/Asset.cpp b/libs/androidfw/Asset.cpp index cb7628d1d5b1..ce6cc38b8357 100644 --- a/libs/androidfw/Asset.cpp +++ b/libs/androidfw/Asset.cpp @@ -843,7 +843,7 @@ void _CompressedAsset::close(void) * The first time this is called, we expand the compressed data into a * buffer. */ -const void* _CompressedAsset::getBuffer(bool wordAligned) +const void* _CompressedAsset::getBuffer(bool) { unsigned char* buf = NULL; @@ -860,7 +860,7 @@ const void* _CompressedAsset::getBuffer(bool wordAligned) } if (mMap != NULL) { - if (!ZipFileRO::inflateBuffer(buf, mMap->getDataPtr(), + if (!ZipUtils::inflateToBuffer(mMap->getDataPtr(), buf, mUncompressedLen, mCompressedLen)) goto bail; } else { |