diff options
Diffstat (limited to 'drm')
| -rw-r--r-- | drm/common/IDrmManagerService.cpp | 4 | ||||
| -rw-r--r-- | drm/drmserver/DrmManager.cpp | 1 | ||||
| -rw-r--r-- | drm/libdrmframework/plugins/widevine/Android.mk | 27 |
3 files changed, 27 insertions, 5 deletions
diff --git a/drm/common/IDrmManagerService.cpp b/drm/common/IDrmManagerService.cpp index b8ae852..c3d12f0 100644 --- a/drm/common/IDrmManagerService.cpp +++ b/drm/common/IDrmManagerService.cpp @@ -539,8 +539,6 @@ DecryptHandle* BpDrmManagerService::openDecryptSession( handle->decryptInfo = new DecryptInfo(); handle->decryptInfo->decryptBufferLength = reply.readInt32(); } - } else { - LOGE("no decryptHandle is generated in service side"); } return handle; } @@ -1223,8 +1221,6 @@ status_t BnDrmManagerService::onTransact( reply->writeInt32(handle->decryptInfo->decryptBufferLength); delete handle->decryptInfo; handle->decryptInfo = NULL; } - } else { - LOGE("NULL decryptHandle is returned"); } delete handle; handle = NULL; return DRM_NO_ERROR; diff --git a/drm/drmserver/DrmManager.cpp b/drm/drmserver/DrmManager.cpp index b7a035f..35e62f3 100644 --- a/drm/drmserver/DrmManager.cpp +++ b/drm/drmserver/DrmManager.cpp @@ -393,7 +393,6 @@ DecryptHandle* DrmManager::openDecryptSession(int uniqueId, int fd, int offset, } if (DRM_NO_ERROR != result) { delete handle; handle = NULL; - LOGE("DrmManager::openDecryptSession: no capable plug-in found"); } return handle; } diff --git a/drm/libdrmframework/plugins/widevine/Android.mk b/drm/libdrmframework/plugins/widevine/Android.mk new file mode 100644 index 0000000..2c388da --- /dev/null +++ b/drm/libdrmframework/plugins/widevine/Android.mk @@ -0,0 +1,27 @@ +# +# Copyright (C) 2010 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +LOCAL_PATH:= $(call my-dir) +include $(CLEAR_VARS) + +LOCAL_MODULE := libdrmwvmplugin + +LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/drm/plugins/native + +LOCAL_PRELINK_MODULE := false + +LOCAL_MODULE_TAGS := optional + +include $(BUILD_SHARED_LIBRARY) |