diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2014-06-10 18:41:50 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-10 18:41:50 +0000 |
| commit | 31dcd338b3826928646d77f23f977ecdd52598a3 (patch) | |
| tree | 62bcf15eb7d991d0c9351c1cf35eb8f5a3887763 /drm/libdrmframework/Android.mk | |
| parent | 47a2377ec07ad4ec06ecd25bfd45a37df91e68e6 (diff) | |
| parent | 4299a7c2b049b07b3456a81a4c2b1030523c08ca (diff) | |
| download | frameworks_av-31dcd338b3826928646d77f23f977ecdd52598a3.zip frameworks_av-31dcd338b3826928646d77f23f977ecdd52598a3.tar.gz frameworks_av-31dcd338b3826928646d77f23f977ecdd52598a3.tar.bz2 | |
am 4299a7c2: am 940f8be3: Merge "Implement a NoOp DrmManagerClientImpl when no DRM service exists" into klp-modular-dev
* commit '4299a7c2b049b07b3456a81a4c2b1030523c08ca':
Implement a NoOp DrmManagerClientImpl when no DRM service exists
Diffstat (limited to 'drm/libdrmframework/Android.mk')
| -rw-r--r-- | drm/libdrmframework/Android.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drm/libdrmframework/Android.mk b/drm/libdrmframework/Android.mk index 49c4f9b..33f9d3b 100644 --- a/drm/libdrmframework/Android.mk +++ b/drm/libdrmframework/Android.mk @@ -19,12 +19,14 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES:= \ DrmManagerClientImpl.cpp \ - DrmManagerClient.cpp + DrmManagerClient.cpp \ + NoOpDrmManagerClientImpl.cpp LOCAL_MODULE:= libdrmframework LOCAL_SHARED_LIBRARIES := \ libutils \ + libcutils \ liblog \ libbinder \ libdl |