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

Commit 7c52bb1e authored by Tomasz Wasilczyk's avatar Tomasz Wasilczyk
Browse files

Don't use String8 path functions 

Ideally, we should migrate to std::filesystem, but libc++fs is not
available for vendor binaries until b/175635923 lands.

Bug: 295394788
Test: m checkbuild
Change-Id: If285034d7b343531082d0176ab26bf51390714d0
parent 7f2619dd

cas/aidl/default/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ cc_library_static { 


    shared_libs: [

        "android.hardware.cas-V1-ndk",

        "libbase",

        "libbinder_ndk",

        "liblog",

        "libutils",
@@ -48,6 +49,7 @@ cc_defaults { 
    ],

    shared_libs: [

        "android.hardware.cas-V1-ndk",

        "libbase",

        "libbinder_ndk",

        "liblog",

        "libutils",

cas/aidl/default/FactoryLoader.h

+3 −2
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
 * limitations under the License.

 */



#include <android-base/strings.h>

#include <dirent.h>

#include <dlfcn.h>

#include <media/cas/CasAPI.h>
@@ -96,7 +97,7 @@ bool FactoryLoader<T>::findFactoryForScheme(int32_t CA_system_id, 
    struct dirent* pEntry;

    while ((pEntry = readdir(pDir))) {

        String8 pluginPath = dirPath + "/" + pEntry->d_name;

        if (pluginPath.getPathExtension() == ".so") {

        if (base::EndsWith(pluginPath.c_str(), ".so")) {

            if (loadFactoryForSchemeFromPath(pluginPath, CA_system_id, library, factory)) {

                mCASystemIdToLibraryPathMap.add(CA_system_id, pluginPath);

                closedir(pDir);
@@ -135,7 +136,7 @@ bool FactoryLoader<T>::enumeratePlugins(vector<AidlCasPluginDescriptor>* results 
    struct dirent* pEntry;

    while ((pEntry = readdir(pDir))) {

        String8 pluginPath = dirPath + "/" + pEntry->d_name;

        if (pluginPath.getPathExtension() == ".so") {

        if (base::EndsWith(pluginPath.c_str(), ".so")) {

            queryPluginsFromPath(pluginPath, results);

        }

    }

drm/1.0/default/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -134,6 +134,7 @@ cc_library_shared { 
    shared_libs: [

        "android.hardware.drm@1.0",

        "android.hidl.memory@1.0",

        "libbase",

        "libcutils",

        "libhidlbase",

        "libhidlmemory",

drm/1.0/default/include/PluginLoader.h

+3 −1
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ 
#define PLUGIN_LOADER_H_



#include "SharedLibrary.h"



#include <android-base/strings.h>

#include <utils/Log.h>

#include <utils/String8.h>

#include <utils/Vector.h>
@@ -46,7 +48,7 @@ class PluginLoader { 
            struct dirent* pEntry;

            while ((pEntry = readdir(pDir))) {

                String8 file(pEntry->d_name);

                if (file.getPathExtension() == ".so") {

                if (base::EndsWith(file.c_str(), ".so")) {

                    String8 path = pluginDir + "/" + pEntry->d_name;

                    T *plugin = loadOne(path, entry);

                    if (plugin) {