Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ee7e77d5 authored by Jeff Tinker's avatar Jeff Tinker
Browse files

fix MediaDrm.isCryptoSchemeSupported(uuid) 

1. Don't expect plugins to support an empty mimeType in isContentTypeSupported
2. Move the cts test mock drm plugin to the cts tree so it is always used

b/10528466

Change-Id: I6023f6165b1e9d294986f7e5cd0896e056e376f1
parent 8271f1a2

drm/mediadrm/plugins/mock/Android.mk

deleted100644 → 0
+0 −38
Original line number Diff line number Diff line 
#

# Copyright (C) 2013 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_SRC_FILES:= \

    MockDrmCryptoPlugin.cpp



LOCAL_MODULE := libmockdrmcryptoplugin



LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_SHARED_LIBRARIES)/mediadrm



LOCAL_SHARED_LIBRARIES := \

    libutils liblog



LOCAL_C_INCLUDES += \

    $(TOP)/frameworks/av/include \

    $(TOP)/frameworks/native/include/media



# Set the following flag to enable the decryption passthru flow

#LOCAL_CFLAGS += -DENABLE_PASSTHRU_DECRYPTION



LOCAL_MODULE_TAGS := optional



include $(BUILD_SHARED_LIBRARY)