commit 9751ad130d2e8ac7fd6b890760adbcf9a28385b9
author Eric Laurent <elaurent@google.com> Thu Jan 20 10:35:29 2011 -0800
committer Android Git Automerger <android-git-automerger@android.com> Thu Jan 20 10:35:29 2011 -0800
tree 8dfd5fc7a1c768c32bbc9991859be2f8ad1752f7
parent 2d9e5440ef937c860b4771aaa3b6f406615eb8d2
parent 87b0438aed11ed7f5e7cc442a5300eb5f20ebdc5

am 4dcaeb6d: am 404946fc: Merge "Fix issue 3371096." into honeycomb

* commit '4dcaeb6d776bc87469a97001a223099c8e805579':
  Fix issue 3371096.

drm/drmserver/DrmManager.cpp

diff --git a/drm/drmserver/DrmManager.cpp b/drm/drmserver/DrmManager.cpp
index b6e0c30..ef7d274 100644
--- a/drm/drmserver/DrmManager.cpp
+++ b/drm/drmserver/DrmManager.cpp
@@ -87,7 +87,7 @@
 }
 
 status_t DrmManager::loadPlugIns() {
-    String8 pluginDirPath("/system/lib/drm/plugins/native");
+    String8 pluginDirPath("/system/lib/drm");
     return loadPlugIns(pluginDirPath);
 }
 

drm/libdrmframework/plugins/forward-lock/FwdLockEngine/Android.mk

diff --git a/drm/libdrmframework/plugins/forward-lock/FwdLockEngine/Android.mk b/drm/libdrmframework/plugins/forward-lock/FwdLockEngine/Android.mk
index d4a6f18..af67aa3 100644
--- a/drm/libdrmframework/plugins/forward-lock/FwdLockEngine/Android.mk
+++ b/drm/libdrmframework/plugins/forward-lock/FwdLockEngine/Android.mk
@@ -60,7 +60,7 @@
     $(LOCAL_PATH)/include \
     external/openssl/include
 
-LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/drm/plugins/native
+LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/drm
 
 LOCAL_MODULE_TAGS := optional