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

Commit 29d6f881 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:...

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

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



Change-Id: I976ceea6d89c2156d40efe74fd0a286da90777ed
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents da5b2987 1d38e861
Loading
Loading
Loading
Loading
+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;
}