summaryrefslogtreecommitdiffstats
path: root/drm
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2014-01-28 01:03:02 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-01-28 01:03:02 +0000
commitbb9e396d311ea38e958fb5b56efff7aea4eaed82 (patch)
tree00b97910b926304a4ce189b751fd9c4ee8563a64 /drm
parent1ae4b6ce27dca66ef9158abdd4744cb9b8d57c02 (diff)
parent06f7d1513ee325b5792ef26b77aeaae373f83ddc (diff)
downloadframeworks_av-bb9e396d311ea38e958fb5b56efff7aea4eaed82.zip
frameworks_av-bb9e396d311ea38e958fb5b56efff7aea4eaed82.tar.gz
frameworks_av-bb9e396d311ea38e958fb5b56efff7aea4eaed82.tar.bz2
am 06f7d151: am 06da69d5: Merge "frameworks/av: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH"
* commit '06f7d1513ee325b5792ef26b77aeaae373f83ddc': frameworks/av: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH
Diffstat (limited to 'drm')
-rw-r--r--drm/libdrmframework/plugins/forward-lock/FwdLockEngine/Android.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/drm/libdrmframework/plugins/forward-lock/FwdLockEngine/Android.mk b/drm/libdrmframework/plugins/forward-lock/FwdLockEngine/Android.mk
index e251f82..48b0afe 100644
--- a/drm/libdrmframework/plugins/forward-lock/FwdLockEngine/Android.mk
+++ b/drm/libdrmframework/plugins/forward-lock/FwdLockEngine/Android.mk
@@ -61,7 +61,7 @@ LOCAL_C_INCLUDES += \
$(LOCAL_PATH)/include \
external/openssl/include
-LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/drm
+LOCAL_MODULE_RELATIVE_PATH := drm
LOCAL_MODULE_TAGS := optional