summaryrefslogtreecommitdiffstats
path: root/drm
diff options
context:
space:
mode:
authorYing Wang <wangying@google.com>2014-02-26 19:35:43 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-02-26 19:35:43 +0000
commit9d79834400009f690d04726d2bb746a9e8281ede (patch)
tree8578224331b4c701b977596ad2b914aa466b5496 /drm
parent591d9a3652f868652ccc48dd9e9714f3a9813963 (diff)
parente0a76795125a81471c408d4a23112e98ae2f0ae3 (diff)
downloadframeworks_av-9d79834400009f690d04726d2bb746a9e8281ede.zip
frameworks_av-9d79834400009f690d04726d2bb746a9e8281ede.tar.gz
frameworks_av-9d79834400009f690d04726d2bb746a9e8281ede.tar.bz2
am e0a76795: am 5969b408: Merge "Use multilib-friendly LOCAL_MODULE_RELATIVE_PATH"
* commit 'e0a76795125a81471c408d4a23112e98ae2f0ae3': Use multilib-friendly LOCAL_MODULE_RELATIVE_PATH
Diffstat (limited to 'drm')
-rw-r--r--drm/mediadrm/plugins/mock/Android.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/drm/mediadrm/plugins/mock/Android.mk b/drm/mediadrm/plugins/mock/Android.mk
index ada23a2..26c245b 100644
--- a/drm/mediadrm/plugins/mock/Android.mk
+++ b/drm/mediadrm/plugins/mock/Android.mk
@@ -21,7 +21,8 @@ LOCAL_SRC_FILES:= \
LOCAL_MODULE := libmockdrmcryptoplugin
-LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_SHARED_LIBRARIES)/mediadrm
+LOCAL_PROPRIETARY_MODULE := true
+LOCAL_MODULE_RELATIVE_PATH := mediadrm
LOCAL_SHARED_LIBRARIES := \
libutils liblog