RM6785-common: Update DRM from salaa F.17
This commit is contained in:
+62
-62
@@ -3128,23 +3128,6 @@ cc_prebuilt_library_shared {
|
|||||||
soc_specific: true,
|
soc_specific: true,
|
||||||
}
|
}
|
||||||
|
|
||||||
cc_prebuilt_library_shared {
|
|
||||||
name: "libtlcWidevineModularDrm",
|
|
||||||
owner: "realme",
|
|
||||||
strip: {
|
|
||||||
none: true,
|
|
||||||
},
|
|
||||||
target: {
|
|
||||||
android_arm: {
|
|
||||||
srcs: ["proprietary/vendor/lib/libtlcWidevineModularDrm.so"],
|
|
||||||
shared_libs: ["libTEECommon", "liblog", "libutils", "libcutils", "libion_mtk", "libion", "libc++", "libc", "libm", "libdl", ],
|
|
||||||
},
|
|
||||||
},
|
|
||||||
compile_multilib: "32",
|
|
||||||
prefer: true,
|
|
||||||
soc_specific: true,
|
|
||||||
}
|
|
||||||
|
|
||||||
cc_prebuilt_library_shared {
|
cc_prebuilt_library_shared {
|
||||||
name: "libvc1dec_sa.ca7",
|
name: "libvc1dec_sa.ca7",
|
||||||
owner: "realme",
|
owner: "realme",
|
||||||
@@ -3417,41 +3400,6 @@ cc_prebuilt_library_shared {
|
|||||||
soc_specific: true,
|
soc_specific: true,
|
||||||
}
|
}
|
||||||
|
|
||||||
cc_prebuilt_library_shared {
|
|
||||||
name: "libwvhidl",
|
|
||||||
owner: "realme",
|
|
||||||
strip: {
|
|
||||||
none: true,
|
|
||||||
},
|
|
||||||
target: {
|
|
||||||
android_arm: {
|
|
||||||
srcs: ["proprietary/vendor/lib/libwvhidl.so"],
|
|
||||||
shared_libs: ["libcrypto_shim", "android.hardware.drm@1.0", "android.hardware.drm@1.1", "android.hardware.drm@1.2", "android.hardware.drm@1.3", "android.hidl.memory@1.0", "libbase", "libcrypto", "libhidlbase", "libhidlmemory", "liblog", "libprotobuf-cpp-lite-3.9.1-vendorcompat", "libutils", "libc++", "libc", "libm", "libdl", ],
|
|
||||||
},
|
|
||||||
},
|
|
||||||
compile_multilib: "32",
|
|
||||||
prefer: true,
|
|
||||||
soc_specific: true,
|
|
||||||
}
|
|
||||||
|
|
||||||
cc_prebuilt_library_shared {
|
|
||||||
name: "libwvdrmengine",
|
|
||||||
owner: "realme",
|
|
||||||
strip: {
|
|
||||||
none: true,
|
|
||||||
},
|
|
||||||
target: {
|
|
||||||
android_arm: {
|
|
||||||
srcs: ["proprietary/vendor/lib/mediadrm/libwvdrmengine.so"],
|
|
||||||
shared_libs: ["libcrypto_shim", "libbase", "libcrypto", "liblog", "libprotobuf-cpp-lite-3.9.1-vendorcompat", "libstagefright_foundation", "libutils", "libc++", "libc", "libm", "libdl", ],
|
|
||||||
},
|
|
||||||
},
|
|
||||||
compile_multilib: "32",
|
|
||||||
relative_install_path: "mediadrm",
|
|
||||||
prefer: true,
|
|
||||||
soc_specific: true,
|
|
||||||
}
|
|
||||||
|
|
||||||
cc_prebuilt_library_shared {
|
cc_prebuilt_library_shared {
|
||||||
name: "vendor.mediatek.hardware.mtkcodecservice@1.1",
|
name: "vendor.mediatek.hardware.mtkcodecservice@1.1",
|
||||||
owner: "realme",
|
owner: "realme",
|
||||||
@@ -13755,6 +13703,23 @@ cc_prebuilt_library_shared {
|
|||||||
soc_specific: true,
|
soc_specific: true,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
cc_prebuilt_library_shared {
|
||||||
|
name: "libtlcWidevineModularDrm",
|
||||||
|
owner: "realme",
|
||||||
|
strip: {
|
||||||
|
none: true,
|
||||||
|
},
|
||||||
|
target: {
|
||||||
|
android_arm64: {
|
||||||
|
srcs: ["proprietary/vendor/lib64/libtlcWidevineModularDrm.so"],
|
||||||
|
shared_libs: ["libTEECommon", "liblog", "libutils", "libcutils", "libion_mtk", "libion", "libc++", "libc", "libm", "libdl", ],
|
||||||
|
},
|
||||||
|
},
|
||||||
|
compile_multilib: "64",
|
||||||
|
prefer: true,
|
||||||
|
soc_specific: true,
|
||||||
|
}
|
||||||
|
|
||||||
cc_prebuilt_library_shared {
|
cc_prebuilt_library_shared {
|
||||||
name: "libudf",
|
name: "libudf",
|
||||||
owner: "realme",
|
owner: "realme",
|
||||||
@@ -13806,6 +13771,41 @@ cc_prebuilt_library_shared {
|
|||||||
soc_specific: true,
|
soc_specific: true,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
cc_prebuilt_library_shared {
|
||||||
|
name: "libwvhidl",
|
||||||
|
owner: "realme",
|
||||||
|
strip: {
|
||||||
|
none: true,
|
||||||
|
},
|
||||||
|
target: {
|
||||||
|
android_arm64: {
|
||||||
|
srcs: ["proprietary/vendor/lib64/libwvhidl.so"],
|
||||||
|
shared_libs: ["android.hardware.drm@1.0", "android.hardware.drm@1.1", "android.hardware.drm@1.2", "android.hardware.drm@1.3", "android.hardware.drm@1.4", "android.hidl.memory@1.0", "libbase", "libcrypto", "libcutils", "libhidlbase", "libhidlmemory", "liblog", "libprotobuf-cpp-lite-3.9.1-vendorcompat", "libutils", "libc++", "libc", "libm", "libdl", ],
|
||||||
|
},
|
||||||
|
},
|
||||||
|
compile_multilib: "64",
|
||||||
|
prefer: true,
|
||||||
|
soc_specific: true,
|
||||||
|
}
|
||||||
|
|
||||||
|
cc_prebuilt_library_shared {
|
||||||
|
name: "libwvdrmengine",
|
||||||
|
owner: "realme",
|
||||||
|
strip: {
|
||||||
|
none: true,
|
||||||
|
},
|
||||||
|
target: {
|
||||||
|
android_arm64: {
|
||||||
|
srcs: ["proprietary/vendor/lib64/mediadrm/libwvdrmengine.so"],
|
||||||
|
shared_libs: ["libbase", "libcrypto", "libhidlbase", "liblog", "libprotobuf-cpp-lite-3.9.1-vendorcompat", "libstagefright_foundation", "libutils", "libc++", "libc", "libm", "libdl", ],
|
||||||
|
},
|
||||||
|
},
|
||||||
|
compile_multilib: "64",
|
||||||
|
relative_install_path: "mediadrm",
|
||||||
|
prefer: true,
|
||||||
|
soc_specific: true,
|
||||||
|
}
|
||||||
|
|
||||||
cc_prebuilt_library_shared {
|
cc_prebuilt_library_shared {
|
||||||
name: "libmtkcam_streaminfo_plugin-p1stt",
|
name: "libmtkcam_streaminfo_plugin-p1stt",
|
||||||
owner: "realme",
|
owner: "realme",
|
||||||
@@ -14924,12 +14924,12 @@ cc_prebuilt_library_shared {
|
|||||||
none: true,
|
none: true,
|
||||||
},
|
},
|
||||||
target: {
|
target: {
|
||||||
android_arm: {
|
android_arm64: {
|
||||||
srcs: ["proprietary/odm/lib/liboemcrypto.so"],
|
srcs: ["proprietary/odm/lib64/liboemcrypto.so"],
|
||||||
shared_libs: ["liblog", "libc++", "libc", "libm", "libdl", ],
|
shared_libs: ["liblog", "libc++", "libc", "libm", "libdl", ],
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
compile_multilib: "32",
|
compile_multilib: "64",
|
||||||
prefer: true,
|
prefer: true,
|
||||||
device_specific: true,
|
device_specific: true,
|
||||||
}
|
}
|
||||||
@@ -15211,9 +15211,9 @@ prebuilt_etc_xml {
|
|||||||
}
|
}
|
||||||
|
|
||||||
prebuilt_etc_xml {
|
prebuilt_etc_xml {
|
||||||
name: "manifest_android.hardware.drm@1.3-service.widevine.xml",
|
name: "manifest_android.hardware.drm@1.4-service.widevine.xml",
|
||||||
owner: "realme",
|
owner: "realme",
|
||||||
src: "proprietary/vendor/etc/vintf/manifest/manifest_android.hardware.drm@1.3-service.widevine.xml",
|
src: "proprietary/vendor/etc/vintf/manifest/manifest_android.hardware.drm@1.4-service.widevine.xml",
|
||||||
filename_from_src: true,
|
filename_from_src: true,
|
||||||
sub_dir: "vintf/manifest",
|
sub_dir: "vintf/manifest",
|
||||||
soc_specific: true,
|
soc_specific: true,
|
||||||
@@ -15571,15 +15571,15 @@ cc_prebuilt_binary {
|
|||||||
}
|
}
|
||||||
|
|
||||||
cc_prebuilt_binary {
|
cc_prebuilt_binary {
|
||||||
name: "android.hardware.drm@1.3-service.widevine",
|
name: "android.hardware.drm@1.4-service.widevine",
|
||||||
owner: "realme",
|
owner: "realme",
|
||||||
target: {
|
target: {
|
||||||
android_arm: {
|
android_arm64: {
|
||||||
srcs: ["proprietary/vendor/bin/hw/android.hardware.drm@1.3-service.widevine"],
|
srcs: ["proprietary/vendor/bin/hw/android.hardware.drm@1.4-service.widevine"],
|
||||||
shared_libs: ["android.hardware.drm@1.0", "android.hardware.drm@1.1", "android.hardware.drm@1.2", "android.hardware.drm@1.3", "libbase", "libhidlbase", "liblog", "libutils", "libwvhidl", "libbinder", "libc++", "libc", "libm", "libdl", ],
|
shared_libs: ["android.hardware.drm@1.0", "android.hardware.drm@1.1", "android.hardware.drm@1.2", "android.hardware.drm@1.3", "libbase", "libhidlbase", "liblog", "libutils", "libbinder", "android.hardware.drm@1.4", "libwvhidl", "libc++", "libc", "libm", "libdl", ],
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
compile_multilib: "32",
|
compile_multilib: "64",
|
||||||
strip: {
|
strip: {
|
||||||
none: true,
|
none: true,
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -505,7 +505,7 @@ PRODUCT_COPY_FILES += \
|
|||||||
vendor/realme/RM6785-common/proprietary/vendor/etc/gnss/carrier/agps_profiles_conf2_carrier_Verizon_Wireless.xml:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/carrier/agps_profiles_conf2_carrier_Verizon_Wireless.xml \
|
vendor/realme/RM6785-common/proprietary/vendor/etc/gnss/carrier/agps_profiles_conf2_carrier_Verizon_Wireless.xml:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/carrier/agps_profiles_conf2_carrier_Verizon_Wireless.xml \
|
||||||
vendor/realme/RM6785-common/proprietary/vendor/etc/gnss/carrier/agps_profiles_conf2_carrier_Vodafone.xml:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/carrier/agps_profiles_conf2_carrier_Vodafone.xml \
|
vendor/realme/RM6785-common/proprietary/vendor/etc/gnss/carrier/agps_profiles_conf2_carrier_Vodafone.xml:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/carrier/agps_profiles_conf2_carrier_Vodafone.xml \
|
||||||
vendor/realme/RM6785-common/proprietary/vendor/etc/init/android.hardware.bluetooth@1.0-service-mediatek.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.bluetooth@1.0-service-mediatek.rc \
|
vendor/realme/RM6785-common/proprietary/vendor/etc/init/android.hardware.bluetooth@1.0-service-mediatek.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.bluetooth@1.0-service-mediatek.rc \
|
||||||
vendor/realme/RM6785-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/realme/RM6785-common/proprietary/vendor/etc/init/android.hardware.drm@1.4-service.widevine.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.drm@1.4-service.widevine.rc \
|
||||||
vendor/realme/RM6785-common/proprietary/vendor/etc/init/android.hardware.gnss@2.1-service-mediatek.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.gnss@2.1-service-mediatek.rc \
|
vendor/realme/RM6785-common/proprietary/vendor/etc/init/android.hardware.gnss@2.1-service-mediatek.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.gnss@2.1-service-mediatek.rc \
|
||||||
vendor/realme/RM6785-common/proprietary/vendor/etc/init/android.hardware.graphics.allocator@4.0-service-mediatek.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.graphics.allocator@4.0-service-mediatek.rc \
|
vendor/realme/RM6785-common/proprietary/vendor/etc/init/android.hardware.graphics.allocator@4.0-service-mediatek.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.graphics.allocator@4.0-service-mediatek.rc \
|
||||||
vendor/realme/RM6785-common/proprietary/vendor/etc/init/android.hardware.keymaster@4.0-service.trustonic.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.keymaster@4.0-service.trustonic.rc \
|
vendor/realme/RM6785-common/proprietary/vendor/etc/init/android.hardware.keymaster@4.0-service.trustonic.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.keymaster@4.0-service.trustonic.rc \
|
||||||
@@ -957,7 +957,6 @@ PRODUCT_PACKAGES += \
|
|||||||
libstorage_otp \
|
libstorage_otp \
|
||||||
libthermalalgo \
|
libthermalalgo \
|
||||||
libthha \
|
libthha \
|
||||||
libtlcWidevineModularDrm \
|
|
||||||
libvc1dec_sa.ca7 \
|
libvc1dec_sa.ca7 \
|
||||||
libvcodec_oal \
|
libvcodec_oal \
|
||||||
libvcodec_utility \
|
libvcodec_utility \
|
||||||
@@ -974,8 +973,6 @@ PRODUCT_PACKAGES += \
|
|||||||
libvp9dec_sa.ca7 \
|
libvp9dec_sa.ca7 \
|
||||||
libvpud_vcodec \
|
libvpud_vcodec \
|
||||||
libvt_custom \
|
libvt_custom \
|
||||||
libwvhidl \
|
|
||||||
libwvdrmengine \
|
|
||||||
vendor.mediatek.hardware.mtkcodecservice@1.1 \
|
vendor.mediatek.hardware.mtkcodecservice@1.1 \
|
||||||
APUWareUtilsServer \
|
APUWareUtilsServer \
|
||||||
APUWareXrpServer \
|
APUWareXrpServer \
|
||||||
@@ -1581,9 +1578,12 @@ PRODUCT_PACKAGES += \
|
|||||||
libstface_fd_api \
|
libstface_fd_api \
|
||||||
libtflite_mtk \
|
libtflite_mtk \
|
||||||
libtflite_mtk_static_R \
|
libtflite_mtk_static_R \
|
||||||
|
libtlcWidevineModularDrm \
|
||||||
libudf \
|
libudf \
|
||||||
libwifi-hal-mtk \
|
libwifi-hal-mtk \
|
||||||
libwifitest \
|
libwifitest \
|
||||||
|
libwvhidl \
|
||||||
|
libwvdrmengine \
|
||||||
libmtkcam_streaminfo_plugin-p1stt \
|
libmtkcam_streaminfo_plugin-p1stt \
|
||||||
ov02b10_mipi_raw_IdxMgr \
|
ov02b10_mipi_raw_IdxMgr \
|
||||||
ov02b10_mipi_raw_tuning \
|
ov02b10_mipi_raw_tuning \
|
||||||
@@ -1675,7 +1675,7 @@ PRODUCT_PACKAGES += \
|
|||||||
android.hardware.gpu@1.0-service.xml \
|
android.hardware.gpu@1.0-service.xml \
|
||||||
android.hardware.neuralnetworks@1.3-service-mtk-dsp-gpu.xml \
|
android.hardware.neuralnetworks@1.3-service-mtk-dsp-gpu.xml \
|
||||||
manifest.xml \
|
manifest.xml \
|
||||||
manifest_android.hardware.drm@1.3-service.widevine.xml \
|
manifest_android.hardware.drm@1.4-service.widevine.xml \
|
||||||
oplus_appradio_device_manifest.xml \
|
oplus_appradio_device_manifest.xml \
|
||||||
oplus_radio_device_manifest.xml \
|
oplus_radio_device_manifest.xml \
|
||||||
vendor.mediatek.hardware.dplanner@2.0-service.xml \
|
vendor.mediatek.hardware.dplanner@2.0-service.xml \
|
||||||
@@ -1698,7 +1698,7 @@ PRODUCT_PACKAGES += \
|
|||||||
fuelgauged_nvram \
|
fuelgauged_nvram \
|
||||||
gsm0710muxd \
|
gsm0710muxd \
|
||||||
android.hardware.bluetooth@1.0-service-mediatek \
|
android.hardware.bluetooth@1.0-service-mediatek \
|
||||||
android.hardware.drm@1.3-service.widevine \
|
android.hardware.drm@1.4-service.widevine \
|
||||||
android.hardware.gnss@2.1-service-mediatek \
|
android.hardware.gnss@2.1-service-mediatek \
|
||||||
android.hardware.graphics.allocator@4.0-service-mediatek \
|
android.hardware.graphics.allocator@4.0-service-mediatek \
|
||||||
android.hardware.keymaster@4.0-service.trustonic \
|
android.hardware.keymaster@4.0-service.trustonic \
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
Binary file not shown.
+3
-1
@@ -9,7 +9,7 @@ service vendor.move_data_sh /system/bin/move_widevine_data.sh
|
|||||||
disabled
|
disabled
|
||||||
oneshot
|
oneshot
|
||||||
|
|
||||||
service vendor.drm-widevine-hal-1-3 /vendor/bin/hw/android.hardware.drm@1.3-service.widevine
|
service vendor.drm-widevine-hal-1-4 /vendor/bin/hw/android.hardware.drm@1.4-service.widevine
|
||||||
interface android.hardware.drm@1.0::ICryptoFactory widevine
|
interface android.hardware.drm@1.0::ICryptoFactory widevine
|
||||||
interface android.hardware.drm@1.0::IDrmFactory widevine
|
interface android.hardware.drm@1.0::IDrmFactory widevine
|
||||||
interface android.hardware.drm@1.1::ICryptoFactory widevine
|
interface android.hardware.drm@1.1::ICryptoFactory widevine
|
||||||
@@ -18,6 +18,8 @@ service vendor.drm-widevine-hal-1-3 /vendor/bin/hw/android.hardware.drm@1.3-serv
|
|||||||
interface android.hardware.drm@1.2::IDrmFactory widevine
|
interface android.hardware.drm@1.2::IDrmFactory widevine
|
||||||
interface android.hardware.drm@1.3::ICryptoFactory widevine
|
interface android.hardware.drm@1.3::ICryptoFactory widevine
|
||||||
interface android.hardware.drm@1.3::IDrmFactory widevine
|
interface android.hardware.drm@1.3::IDrmFactory widevine
|
||||||
|
interface android.hardware.drm@1.4::ICryptoFactory widevine
|
||||||
|
interface android.hardware.drm@1.4::IDrmFactory widevine
|
||||||
interface android.hidl.base@1.0::IBase widevine
|
interface android.hidl.base@1.0::IBase widevine
|
||||||
class hal
|
class hal
|
||||||
user media
|
user media
|
||||||
+3
-3
@@ -1,5 +1,5 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<!-- Copyright (C) 2019 The Android Open Source Project
|
<!-- Copyright (C) 2021 The Android Open Source Project
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
you may not use this file except in compliance with the License.
|
you may not use this file except in compliance with the License.
|
||||||
@@ -17,7 +17,7 @@
|
|||||||
<hal format="hidl">
|
<hal format="hidl">
|
||||||
<name>android.hardware.drm</name>
|
<name>android.hardware.drm</name>
|
||||||
<transport>hwbinder</transport>
|
<transport>hwbinder</transport>
|
||||||
<fqname>@1.3::ICryptoFactory/widevine</fqname>
|
<fqname>@1.4::ICryptoFactory/widevine</fqname>
|
||||||
<fqname>@1.3::IDrmFactory/widevine</fqname>
|
<fqname>@1.4::IDrmFactory/widevine</fqname>
|
||||||
</hal>
|
</hal>
|
||||||
</manifest>
|
</manifest>
|
||||||
Binary file not shown.
Vendored
BIN
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
Binary file not shown.
Binary file not shown.
Reference in New Issue
Block a user