commit 53a5cdf982565b4a710a46931be21a02f97dd0b9
author Elliott Hughes <enh@google.com> Tue May 21 13:24:57 2019 -0700
committer android-build-merger <android-build-merger@google.com> Tue May 21 13:24:57 2019 -0700
tree 3ecbd551aed4fc4d7f94b8077a25f5a9b0964bfc
parent 47e9ffdbd977e3b45a08ffd3c2b261616f4354bb
parent badfa869518949bff61c00e8f711daa38c2e9fa5

Merge "libstagefright: track libziparchive API change."
am: badfa86951

Change-Id: I72e7f99937172a7024ee344fc7e625518ca0d24f

media/libstagefright/MediaExtractorFactory.cpp

diff --git a/media/libstagefright/MediaExtractorFactory.cpp b/media/libstagefright/MediaExtractorFactory.cpp
index b0bf269..3597a4d 100644
--- a/media/libstagefright/MediaExtractorFactory.cpp
+++ b/media/libstagefright/MediaExtractorFactory.cpp
@@ -223,10 +223,8 @@
         char abi[PROPERTY_VALUE_MAX];
         property_get("ro.product.cpu.abi", abi, "arm64-v8a");
         String8 prefix8 = String8::format("lib/%s/", abi);
-        ZipString prefix(prefix8.c_str());
-        ZipString suffix("extractor.so");
         void* cookie;
-        ret = StartIteration(zipHandle, &cookie, &prefix, &suffix);
+        ret = StartIteration(zipHandle, &cookie, prefix8.c_str(), "extractor.so");
         if (ret == 0) {
             ZipEntry entry;
             ZipString name;