a71-common: Drop TARGET_ENABLE_MEDIADRM_64 flag
* This is not needed, since Widevine DRM and Clearkey DRM services are available. Change-Id: Iea9eb845895ee4aee072df2112e9c681d3f31337
This commit is contained in:
@@ -153,6 +153,15 @@ prebuilt_etc_xml {
|
||||
soc_specific: true,
|
||||
}
|
||||
|
||||
prebuilt_etc_xml {
|
||||
name: "manifest_android.hardware.drm@1.3-service.clearkey",
|
||||
owner: "samsung",
|
||||
src: "proprietary/vendor/etc/vintf/manifest/manifest_android.hardware.drm@1.3-service.clearkey.xml",
|
||||
filename_from_src: true,
|
||||
sub_dir: "vintf/manifest",
|
||||
soc_specific: true,
|
||||
}
|
||||
|
||||
prebuilt_etc_xml {
|
||||
name: "manifest_android.hardware.drm@1.3-service.widevine",
|
||||
owner: "samsung",
|
||||
|
||||
@@ -28,6 +28,7 @@ PRODUCT_COPY_FILES += \
|
||||
vendor/samsung/a71-common/proprietary/vendor/bin/hdcp2p2prov:$(TARGET_COPY_OUT_VENDOR)/bin/hdcp2p2prov \
|
||||
vendor/samsung/a71-common/proprietary/vendor/bin/hvdcp_opti:$(TARGET_COPY_OUT_VENDOR)/bin/hvdcp_opti \
|
||||
vendor/samsung/a71-common/proprietary/vendor/bin/hw/android.hardware.bluetooth@1.0-service-qti:$(TARGET_COPY_OUT_VENDOR)/bin/hw/android.hardware.bluetooth@1.0-service-qti \
|
||||
vendor/samsung/a71-common/proprietary/vendor/bin/hw/android.hardware.drm@1.3-service.clearkey:$(TARGET_COPY_OUT_VENDOR)/bin/hw/android.hardware.drm@1.3-service.clearkey \
|
||||
vendor/samsung/a71-common/proprietary/vendor/bin/hw/android.hardware.drm@1.3-service.widevine:$(TARGET_COPY_OUT_VENDOR)/bin/hw/android.hardware.drm@1.3-service.widevine \
|
||||
vendor/samsung/a71-common/proprietary/vendor/bin/hw/android.hardware.health@2.1-service-samsung:$(TARGET_COPY_OUT_VENDOR)/bin/hw/android.hardware.health@2.1-service-samsung \
|
||||
vendor/samsung/a71-common/proprietary/vendor/bin/hw/android.hardware.usb@1.1-service.wahoo:$(TARGET_COPY_OUT_VENDOR)/bin/hw/android.hardware.usb@1.1-service.wahoo \
|
||||
@@ -309,6 +310,7 @@ PRODUCT_COPY_FILES += \
|
||||
vendor/samsung/a71-common/proprietary/vendor/etc/data/netmgr_config.xml:$(TARGET_COPY_OUT_VENDOR)/etc/data/netmgr_config.xml \
|
||||
vendor/samsung/a71-common/proprietary/vendor/etc/gpfspath_oem_config.xml:$(TARGET_COPY_OUT_VENDOR)/etc/gpfspath_oem_config.xml \
|
||||
vendor/samsung/a71-common/proprietary/vendor/etc/init/android.hardware.bluetooth@1.0-service-qti.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.bluetooth@1.0-service-qti.rc \
|
||||
vendor/samsung/a71-common/proprietary/vendor/etc/init/android.hardware.drm@1.3-service.clearkey.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.drm@1.3-service.clearkey.rc \
|
||||
vendor/samsung/a71-common/proprietary/vendor/etc/init/android.hardware.drm@1.3-service.widevine.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.drm@1.3-service.widevine.rc \
|
||||
vendor/samsung/a71-common/proprietary/vendor/etc/init/android.hardware.health@2.1-service-samsung.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.health@2.1-service-samsung.rc \
|
||||
vendor/samsung/a71-common/proprietary/vendor/etc/init/android.hardware.usb@1.1-service.wahoo.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.usb@1.1-service.wahoo.rc \
|
||||
@@ -1211,5 +1213,6 @@ PRODUCT_PACKAGES += \
|
||||
audiosphere \
|
||||
vendor.qti.voiceprint-V1.0-java \
|
||||
android.hardware.health@2.1-samsung \
|
||||
manifest_android.hardware.drm@1.3-service.clearkey \
|
||||
manifest_android.hardware.drm@1.3-service.widevine \
|
||||
vendor.samsung.hardware.thermal@1.0-manifest
|
||||
|
||||
BIN
proprietary/vendor/bin/hw/android.hardware.drm@1.3-service.clearkey
vendored
Normal file
BIN
proprietary/vendor/bin/hw/android.hardware.drm@1.3-service.clearkey
vendored
Normal file
Binary file not shown.
14
proprietary/vendor/etc/init/android.hardware.drm@1.3-service.clearkey.rc
vendored
Normal file
14
proprietary/vendor/etc/init/android.hardware.drm@1.3-service.clearkey.rc
vendored
Normal file
@@ -0,0 +1,14 @@
|
||||
service vendor.drm-clearkey-hal-1-3 /vendor/bin/hw/android.hardware.drm@1.3-service.clearkey
|
||||
interface android.hardware.drm@1.0::ICryptoFactory clearkey
|
||||
interface android.hardware.drm@1.0::IDrmFactory clearkey
|
||||
interface android.hardware.drm@1.1::ICryptoFactory clearkey
|
||||
interface android.hardware.drm@1.1::IDrmFactory clearkey
|
||||
interface android.hardware.drm@1.2::ICryptoFactory clearkey
|
||||
interface android.hardware.drm@1.2::IDrmFactory clearkey
|
||||
interface android.hardware.drm@1.3::ICryptoFactory clearkey
|
||||
interface android.hardware.drm@1.3::IDrmFactory clearkey
|
||||
class hal
|
||||
user media
|
||||
group media mediadrm
|
||||
ioprio rt 4
|
||||
writepid /dev/cpuset/foreground/tasks
|
||||
23
proprietary/vendor/etc/vintf/manifest/manifest_android.hardware.drm@1.3-service.clearkey.xml
vendored
Normal file
23
proprietary/vendor/etc/vintf/manifest/manifest_android.hardware.drm@1.3-service.clearkey.xml
vendored
Normal file
@@ -0,0 +1,23 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Copyright (C) 2019 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.
|
||||
-->
|
||||
<manifest version="1.0" type="device">
|
||||
<hal format="hidl">
|
||||
<name>android.hardware.drm</name>
|
||||
<transport>hwbinder</transport>
|
||||
<fqname>@1.3::ICryptoFactory/clearkey</fqname>
|
||||
<fqname>@1.3::IDrmFactory/clearkey</fqname>
|
||||
</hal>
|
||||
</manifest>
|
||||
Reference in New Issue
Block a user