summaryrefslogtreecommitdiff
path: root/libs/androidfw/ApkAssets.cpp
diff options
context:
space:
mode:
author Ryan Prichard <rprichard@google.com> 2018-10-15 22:05:59 -0700
committer android-build-merger <android-build-merger@google.com> 2018-10-15 22:05:59 -0700
commit559dbd88c7e27638965308ab763e71aa0cd3d1cd (patch)
treea171773d9037c7628f4e47d0c821bf7213100c9d /libs/androidfw/ApkAssets.cpp
parent482e8570d1a60145e47ef7ba461893bdd27db975 (diff)
parent498357670e30d48f0219578719cf005e7a21cf04 (diff)
Merge "Change ZipArchiveHandle from void* to ZipArchive*" am: f79542efd3 am: a34a1e0c97
am: 498357670e Change-Id: I4fe5a70c750328bb67cdc02a08e4f9eeb97ac20d
Diffstat (limited to 'libs/androidfw/ApkAssets.cpp')
-rw-r--r--libs/androidfw/ApkAssets.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/androidfw/ApkAssets.cpp b/libs/androidfw/ApkAssets.cpp
index 8f58f74d4652..66a547723b2f 100644
--- a/libs/androidfw/ApkAssets.cpp
+++ b/libs/androidfw/ApkAssets.cpp
@@ -39,7 +39,7 @@ using base::unique_fd;
static const std::string kResourcesArsc("resources.arsc");
-ApkAssets::ApkAssets(void* unmanaged_handle, const std::string& path)
+ApkAssets::ApkAssets(ZipArchiveHandle unmanaged_handle, const std::string& path)
: zip_handle_(unmanaged_handle, ::CloseArchive), path_(path) {
}