commit e21495572bebb9c7b5fad745ca1516e53e8fd395
author Gloria Wang <gwang@google.com> Wed Jan 19 16:01:34 2011 -0800
committer Android Git Automerger <android-git-automerger@android.com> Wed Jan 19 16:01:34 2011 -0800
tree 405625778609c9d65ff20fb3571227867100f16f
parent 62c64c48f8ae8142b893b20cf08fab2cb2a1d69f
parent 5cc52d46226bf1ab6faa8910413153c0b86dc5c9

am 113529f0: am a4b0cdc9: Merge "More fix for 64 bit offset." into honeycomb

* commit '113529f062c43b111efbbd1382e23befdd1cdd30':
  More fix for 64 bit offset.

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