commit 5688459765a29875a7bd11d05b8965fb91525614
author Andreas Huber <andih@google.com> Fri Jan 21 13:19:42 2011 -0800
committer Android Git Automerger <android-git-automerger@android.com> Fri Jan 21 13:19:42 2011 -0800
tree 48e62194e1e3377a8245a226c559edcbccc70207
parent 39fd6ce3c83daaccae47e9b3b68cdc6a89256424
parent 42ab78068f67d5b22fbfbcf40448bae505d543ca

am 9a62d902: am 05aa0827: Merge "Some tweaks to HTTP live / nuplayer behaviour" into honeycomb

* commit '9a62d902ead8f94fa0ce071300e3767bfb976d8b':
  Some tweaks to HTTP live / nuplayer behaviour

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