tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Don't use String8 path functions" into main am: 24c2867516

Browse source 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2723933

Change-Id: Id022e5081019c438e2a507ba2fb318c6c069cbfd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2023-08-25 23:16:51 +00:00 committed by Automerger Merge Worker
commit 7b57d23fba
4 changed files with 9 additions and 3 deletions
Show stats 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) {