| commit | 768f4c48025f051d780589de60eadcf91573a3b8 | [log] [tgz] |
|---|---|---|
| author | Robert Shih <robertshih@google.com> | Fri Apr 22 05:53:54 2022 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Apr 22 05:53:54 2022 +0000 |
| tree | 667d617624400911d19edcbe4971e0cbd2206f94 | |
| parent | bd5a6dd6cd593edda68899b0340f5424fffeea44 [diff] | |
| parent | 7ba9c9906d3e19b5cab96e811a6ce2d8ef502b89 [diff] |
Merge "DrmManager: choose plugin load path based on arch" into tm-dev
diff --git a/drm/drmserver/DrmManager.cpp b/drm/drmserver/DrmManager.cpp index 74e3223..f7989bd 100644 --- a/drm/drmserver/DrmManager.cpp +++ b/drm/drmserver/DrmManager.cpp
@@ -208,7 +208,11 @@ } status_t DrmManager::loadPlugIns() { +#if __LP64__ + String8 pluginDirPath("/system/lib64/drm"); +#else String8 pluginDirPath("/system/lib/drm"); +#endif loadPlugIns(pluginDirPath); return DRM_NO_ERROR; }