diff options
author | Ying Wang <wangying@google.com> | 2013-04-09 22:25:13 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-04-09 22:25:13 -0700 |
commit | 844ebdef8c73b98ec29c75f1fd7940624e70d14d (patch) | |
tree | 0ae3d9ebfea83148018ebf4825ad9c902e8d8e83 /drm | |
parent | a4d0cd1b817a3c55858af5f754f7daa302de087e (diff) | |
parent | e63f850b179a43a344d438f202ad34ec7566f955 (diff) | |
download | frameworks_av-844ebdef8c73b98ec29c75f1fd7940624e70d14d.zip frameworks_av-844ebdef8c73b98ec29c75f1fd7940624e70d14d.tar.gz frameworks_av-844ebdef8c73b98ec29c75f1fd7940624e70d14d.tar.bz2 |
am e63f850b: am da0dc0af: Add liblog
* commit 'e63f850b179a43a344d438f202ad34ec7566f955':
Add liblog
Diffstat (limited to 'drm')
-rw-r--r-- | drm/drmserver/Android.mk | 1 | ||||
-rw-r--r-- | drm/libdrmframework/Android.mk | 1 | ||||
-rw-r--r-- | drm/libdrmframework/plugins/forward-lock/FwdLockEngine/Android.mk | 1 | ||||
-rw-r--r-- | drm/libdrmframework/plugins/passthru/Android.mk | 1 | ||||
-rw-r--r-- | drm/mediadrm/plugins/mock/Android.mk | 2 |
5 files changed, 5 insertions, 1 deletions
diff --git a/drm/drmserver/Android.mk b/drm/drmserver/Android.mk index 96205a1..dc973da 100644 --- a/drm/drmserver/Android.mk +++ b/drm/drmserver/Android.mk @@ -24,6 +24,7 @@ LOCAL_SRC_FILES:= \ LOCAL_SHARED_LIBRARIES := \ libmedia \ libutils \ + liblog \ libbinder \ libdl diff --git a/drm/libdrmframework/Android.mk b/drm/libdrmframework/Android.mk index 9e07fe3..49c4f9b 100644 --- a/drm/libdrmframework/Android.mk +++ b/drm/libdrmframework/Android.mk @@ -25,6 +25,7 @@ LOCAL_MODULE:= libdrmframework LOCAL_SHARED_LIBRARIES := \ libutils \ + liblog \ libbinder \ libdl diff --git a/drm/libdrmframework/plugins/forward-lock/FwdLockEngine/Android.mk b/drm/libdrmframework/plugins/forward-lock/FwdLockEngine/Android.mk index 205b9a5..e251f82 100644 --- a/drm/libdrmframework/plugins/forward-lock/FwdLockEngine/Android.mk +++ b/drm/libdrmframework/plugins/forward-lock/FwdLockEngine/Android.mk @@ -36,6 +36,7 @@ LOCAL_SHARED_LIBRARIES := \ libicui18n \ libicuuc \ libutils \ + liblog \ libdl \ libcrypto \ libssl \ diff --git a/drm/libdrmframework/plugins/passthru/Android.mk b/drm/libdrmframework/plugins/passthru/Android.mk index d170d49..cb3a2e2 100644 --- a/drm/libdrmframework/plugins/passthru/Android.mk +++ b/drm/libdrmframework/plugins/passthru/Android.mk @@ -25,6 +25,7 @@ LOCAL_STATIC_LIBRARIES := libdrmframeworkcommon LOCAL_SHARED_LIBRARIES := \ libutils \ + liblog \ libdl diff --git a/drm/mediadrm/plugins/mock/Android.mk b/drm/mediadrm/plugins/mock/Android.mk index a056cd8..ada23a2 100644 --- a/drm/mediadrm/plugins/mock/Android.mk +++ b/drm/mediadrm/plugins/mock/Android.mk @@ -24,7 +24,7 @@ LOCAL_MODULE := libmockdrmcryptoplugin LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_SHARED_LIBRARIES)/mediadrm LOCAL_SHARED_LIBRARIES := \ - libutils + libutils liblog LOCAL_C_INCLUDES += \ $(TOP)/frameworks/av/include \ |