commit 7ba9c9906d3e19b5cab96e811a6ce2d8ef502b89
author Robert Shih <robertshih@google.com> Wed Apr 20 15:33:51 2022 -0700
committer Robert Shih <robertshih@google.com> Wed Apr 20 15:40:10 2022 -0700
tree ab9697c8d86c1f80e7f867d7cf94ceaf1bd67f67
parent 09dcfbe9c0cb6c6063dca3842bcd3972f94088d1

DrmManager: choose plugin load path based on arch

Bug: 202629223
Test: DRMTest#testForwardLockAccess
Change-Id: I2ff04a0a7b73c1397114a532f83f845042a023fa

drm/drmserver/DrmManager.cpp

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;
 }