From 560566d2915c03bed338fc532ac7f7aa3620cfdf Mon Sep 17 00:00:00 2001 From: Narayan Kamath Date: Tue, 3 Dec 2013 13:16:03 +0000 Subject: 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 (cherry picked from commit afd31e08299008fdc5c2813f21b2573f29dc53df) Change-Id: Iae67e62f1dc6dfc3f43e29bc38e3ffd1cb14d191 --- libs/androidfw/Asset.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libs/androidfw/Asset.cpp') 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 { -- cgit v1.2.3-59-g8ed1b