Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 11:36:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Don't use String8 path functions" into main

Browse Source
This commit is contained in:
Treehugger Robot
2023-08-25 22:44:37 +00:00
committed by Gerrit Code Review
parent 7bed173e4c 7c52bb1e7f
commit 24c2867516
4 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cas/aidl/default/Android.bp
View File

@@ -21,6 +21,7 @@ cc_library_static {
shared_libs: [ shared_libs: [
"android.hardware.cas-V1-ndk", "android.hardware.cas-V1-ndk",
"libbase",
"libbinder_ndk", "libbinder_ndk",
"liblog", "liblog",
"libutils", "libutils",
@@ -48,6 +49,7 @@ cc_defaults {
], ],
shared_libs: [ shared_libs: [
"android.hardware.cas-V1-ndk", "android.hardware.cas-V1-ndk",
"libbase",
"libbinder_ndk", "libbinder_ndk",
"liblog", "liblog",
"libutils", "libutils",

5
cas/aidl/default/FactoryLoader.h
View File

@@ -14,6 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
#include <android-base/strings.h>
#include <dirent.h> #include <dirent.h>
#include <dlfcn.h> #include <dlfcn.h>
#include <media/cas/CasAPI.h> #include <media/cas/CasAPI.h>
@@ -96,7 +97,7 @@ bool FactoryLoader<T>::findFactoryForScheme(int32_t CA_system_id,
struct dirent* pEntry; struct dirent* pEntry;
while ((pEntry = readdir(pDir))) { while ((pEntry = readdir(pDir))) {
String8 pluginPath = dirPath + "/" + pEntry->d_name; 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)) { if (loadFactoryForSchemeFromPath(pluginPath, CA_system_id, library, factory)) {
mCASystemIdToLibraryPathMap.add(CA_system_id, pluginPath); mCASystemIdToLibraryPathMap.add(CA_system_id, pluginPath);
closedir(pDir); closedir(pDir);
@@ -135,7 +136,7 @@ bool FactoryLoader<T>::enumeratePlugins(vector<AidlCasPluginDescriptor>* results
struct dirent* pEntry; struct dirent* pEntry;
while ((pEntry = readdir(pDir))) { while ((pEntry = readdir(pDir))) {
String8 pluginPath = dirPath + "/" + pEntry->d_name; String8 pluginPath = dirPath + "/" + pEntry->d_name;
if (pluginPath.getPathExtension() == ".so") { if (base::EndsWith(pluginPath.c_str(), ".so")) {
queryPluginsFromPath(pluginPath, results); queryPluginsFromPath(pluginPath, results);
} }
} }

1
drm/1.0/default/Android.bp
View File

@@ -134,6 +134,7 @@ cc_library_shared {
shared_libs: [ shared_libs: [
"android.hardware.drm@1.0", "android.hardware.drm@1.0",
"android.hidl.memory@1.0", "android.hidl.memory@1.0",
"libbase",
"libcutils", "libcutils",
"libhidlbase", "libhidlbase",
"libhidlmemory", "libhidlmemory",

4
drm/1.0/default/include/PluginLoader.h
View File

@@ -18,6 +18,8 @@
#define PLUGIN_LOADER_H_ #define PLUGIN_LOADER_H_
#include "SharedLibrary.h" #include "SharedLibrary.h"
#include <android-base/strings.h>
#include <utils/Log.h> #include <utils/Log.h>
#include <utils/String8.h> #include <utils/String8.h>
#include <utils/Vector.h> #include <utils/Vector.h>
@@ -46,7 +48,7 @@ class PluginLoader {
struct dirent* pEntry; struct dirent* pEntry;
while ((pEntry = readdir(pDir))) { while ((pEntry = readdir(pDir))) {
String8 file(pEntry->d_name); String8 file(pEntry->d_name);
if (file.getPathExtension() == ".so") { if (base::EndsWith(file.c_str(), ".so")) {
String8 path = pluginDir + "/" + pEntry->d_name; String8 path = pluginDir + "/" + pEntry->d_name;
T *plugin = loadOne(path, entry); T *plugin = loadOne(path, entry);
if (plugin) { if (plugin) {