diff options
| author | Ying Wang <wangying@google.com> | 2014-03-11 18:08:16 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-11 18:08:16 +0000 |
| commit | 0f1c0f0d7a2a8f2419e0218d1dc03c4b02260e7a (patch) | |
| tree | d44dc0d0bda3bb972d9a8069b7bfa7c485d24c23 | |
| parent | c2dc9646b7c8aa4a55901edba04f45c99a9ed662 (diff) | |
| parent | 5969b40858d2046aa2b8481926e34c4cb9062a4a (diff) | |
| download | frameworks_av-0f1c0f0d7a2a8f2419e0218d1dc03c4b02260e7a.zip frameworks_av-0f1c0f0d7a2a8f2419e0218d1dc03c4b02260e7a.tar.gz frameworks_av-0f1c0f0d7a2a8f2419e0218d1dc03c4b02260e7a.tar.bz2 | |
am 5969b408: Merge "Use multilib-friendly LOCAL_MODULE_RELATIVE_PATH"
* commit '5969b40858d2046aa2b8481926e34c4cb9062a4a':
Use multilib-friendly LOCAL_MODULE_RELATIVE_PATH
| -rw-r--r-- | drm/mediadrm/plugins/mock/Android.mk | 3 |
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 |