diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2014-06-09 21:12:44 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-09 21:12:44 +0000 |
| commit | 4299a7c2b049b07b3456a81a4c2b1030523c08ca (patch) | |
| tree | d3540220be0376ea8166a6d60941fd9ef753dc99 /drm/libdrmframework/Android.mk | |
| parent | cb3d3a365c91ed996c47dea6ff1490f2f13c1b52 (diff) | |
| parent | 940f8be3619cecda66dad33f995904795df88c2d (diff) | |
| download | frameworks_av-4299a7c2b049b07b3456a81a4c2b1030523c08ca.zip frameworks_av-4299a7c2b049b07b3456a81a4c2b1030523c08ca.tar.gz frameworks_av-4299a7c2b049b07b3456a81a4c2b1030523c08ca.tar.bz2 | |
am 940f8be3: Merge "Implement a NoOp DrmManagerClientImpl when no DRM service exists" into klp-modular-dev
* commit '940f8be3619cecda66dad33f995904795df88c2d':
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 |