Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a05d8706 authored by Elliott Hughes's avatar Elliott Hughes Committed by android-build-merger
Browse files

Merge "Move one last caller off ZipString."

am: 4c76131a

Change-Id: I4394d0ca20a65f914c6c87e76d3d7203c57d1046
parents 15d9e16d 4c76131a
Loading
Loading
Loading
Loading
+2 −3
Original line number Diff line number Diff line
@@ -227,10 +227,9 @@ void MediaExtractorFactory::RegisterExtractorsInApk(
        ret = StartIteration(zipHandle, &cookie, prefix8.c_str(), "extractor.so");
        if (ret == 0) {
            ZipEntry entry;
            ZipString name;
            std::string_view name;
            while (Next(cookie, &entry, &name) == 0) {
                String8 libPath = String8(apkPath) + "!/" +
                    String8(reinterpret_cast<const char*>(name.name), name.name_length);
                String8 libPath = String8(apkPath) + "!/" + String8(name.data(), name.size());
                // TODO: Open with a linker namespace so that it can be linked with sub-libraries
                // within the apk instead of system libraries already loaded.
                void *libHandle = dlopen(libPath.string(), RTLD_NOW | RTLD_LOCAL);