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

Commit 63d7e554 authored by Robert Shih's avatar Robert Shih Committed by Automerger Merge Worker
Browse files

Merge "DrmManager: choose plugin load path based on arch" into tm-dev am: 768f4c48 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/17873358



Change-Id: I135c41715d18eadbda1c9ce43f640e2bfd0b0ccb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 12b33cb1 768f4c48

drm/drmserver/DrmManager.cpp

+4 −0
Original line number Diff line number Diff line
@@ -208,7 +208,11 @@ void DrmManager::removeUniqueId(int uniqueId) { 
}



status_t DrmManager::loadPlugIns() {

#if __LP64__

    String8 pluginDirPath("/system/lib64/drm");

#else

    String8 pluginDirPath("/system/lib/drm");

#endif

    loadPlugIns(pluginDirPath);

    return DRM_NO_ERROR;

}