commit bdbd7c6da5731becda6c467855e2240e159f8c67
author James Dong <jdong@google.com> Wed Jan 19 10:32:58 2011 -0800
committer Android Git Automerger <android-git-automerger@android.com> Wed Jan 19 10:32:58 2011 -0800
tree 89d2f34ea0043d46369627203e272def71d821b1
parent 761645bfdb5cb848380762491c0dde9f44027c7e
parent a027eaf8b23118354ffef89b40cc36bf93f1c769

am 6df89f2e: am 8e7d6263: Merge "Expose average video frame rate via MPEG4Extractor" into honeycomb

* commit '6df89f2efc587b33134c545f594a5b1ac2cd9fbb':
  Expose average video frame rate via MPEG4Extractor

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