diff --git a/Android.bp b/Android.bp index 474f866..4a359d8 100644 --- a/Android.bp +++ b/Android.bp @@ -8421,14 +8421,14 @@ cc_prebuilt_library_shared { "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", - "libhidltransport", - "libhwbinder", "liblog", - "libprotobuf-cpp-lite-vendorcompat", + "libprotobuf-cpp-lite-3.9.1-vendorcompat", "libutils", "libc++", "libc", @@ -8483,8 +8483,9 @@ cc_prebuilt_library_shared { shared_libs: [ "libcrypto_shim", "libbase", + "libcrypto", "liblog", - "libprotobuf-cpp-lite-vendorcompat", + "libprotobuf-cpp-lite-3.9.1-vendorcompat", "libstagefright_foundation", "libutils", "libc++", @@ -12935,6 +12936,15 @@ prebuilt_etc_xml { soc_specific: true, } +prebuilt_etc_xml { + name: "manifest_android.hardware.drm@1.3-service.widevine.xml", + owner: "xiaomi", + src: "proprietary/vendor/etc/vintf/manifest/manifest_android.hardware.drm@1.3-service.widevine.xml", + filename_from_src: true, + sub_dir: "vintf/manifest", + soc_specific: true, +} + cc_prebuilt_binary { name: "ATFWD-daemon", owner: "xiaomi", @@ -13236,21 +13246,20 @@ cc_prebuilt_binary { } cc_prebuilt_binary { - name: "android.hardware.drm@1.2-service.widevine", + name: "android.hardware.drm@1.3-service.widevine", owner: "xiaomi", target: { android_arm64: { srcs: [ - "proprietary/vendor/bin/hw/android.hardware.drm@1.2-service.widevine", + "proprietary/vendor/bin/hw/android.hardware.drm@1.3-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", - "libhidltransport", - "libhwbinder", "liblog", "libutils", "libwvhidl", diff --git a/proprietary/vendor/bin/hw/android.hardware.drm@1.2-service.widevine b/proprietary/vendor/bin/hw/android.hardware.drm@1.2-service.widevine deleted file mode 100755 index db6c9c5..0000000 Binary files a/proprietary/vendor/bin/hw/android.hardware.drm@1.2-service.widevine and /dev/null differ diff --git a/proprietary/vendor/bin/hw/android.hardware.drm@1.3-service.widevine b/proprietary/vendor/bin/hw/android.hardware.drm@1.3-service.widevine new file mode 100755 index 0000000..6ff2a7e Binary files /dev/null and b/proprietary/vendor/bin/hw/android.hardware.drm@1.3-service.widevine differ diff --git a/proprietary/vendor/etc/init/android.hardware.drm@1.2-service.widevine.rc b/proprietary/vendor/etc/init/android.hardware.drm@1.3-service.widevine.rc similarity index 77% rename from proprietary/vendor/etc/init/android.hardware.drm@1.2-service.widevine.rc rename to proprietary/vendor/etc/init/android.hardware.drm@1.3-service.widevine.rc index 7832b45..7dade15 100644 --- a/proprietary/vendor/etc/init/android.hardware.drm@1.2-service.widevine.rc +++ b/proprietary/vendor/etc/init/android.hardware.drm@1.3-service.widevine.rc @@ -9,17 +9,19 @@ service vendor.move_data_sh /system/bin/move_widevine_data.sh disabled oneshot -service vendor.drm-widevine-hal-1-2 /vendor/bin/hw/android.hardware.drm@1.2-service.widevine +service vendor.drm-widevine-hal-1-3 /vendor/bin/hw/android.hardware.drm@1.3-service.widevine interface android.hardware.drm@1.0::ICryptoFactory widevine interface android.hardware.drm@1.0::IDrmFactory widevine interface android.hardware.drm@1.1::ICryptoFactory widevine interface android.hardware.drm@1.1::IDrmFactory widevine interface android.hardware.drm@1.2::ICryptoFactory widevine interface android.hardware.drm@1.2::IDrmFactory widevine + interface android.hardware.drm@1.3::ICryptoFactory widevine + interface android.hardware.drm@1.3::IDrmFactory widevine interface android.hidl.base@1.0::IBase widevine class hal user media group media mediadrm drmrpc system ioprio rt 4 writepid /dev/cpuset/foreground/tasks - writepid /sys/kernel/ktrace/sched/drm_pid + capabilities SYS_NICE diff --git a/proprietary/vendor/etc/vintf/manifest/manifest_android.hardware.drm@1.3-service.widevine.xml b/proprietary/vendor/etc/vintf/manifest/manifest_android.hardware.drm@1.3-service.widevine.xml new file mode 100644 index 0000000..f6f2d88 --- /dev/null +++ b/proprietary/vendor/etc/vintf/manifest/manifest_android.hardware.drm@1.3-service.widevine.xml @@ -0,0 +1,23 @@ + + + + + android.hardware.drm + hwbinder + @1.3::ICryptoFactory/widevine + @1.3::IDrmFactory/widevine + + diff --git a/proprietary/vendor/lib64/libwvhidl.so b/proprietary/vendor/lib64/libwvhidl.so index e062da8..5605e92 100644 Binary files a/proprietary/vendor/lib64/libwvhidl.so and b/proprietary/vendor/lib64/libwvhidl.so differ diff --git a/proprietary/vendor/lib64/mediadrm/libwvdrmengine.so b/proprietary/vendor/lib64/mediadrm/libwvdrmengine.so index ac47a0a..24bbae7 100644 Binary files a/proprietary/vendor/lib64/mediadrm/libwvdrmengine.so and b/proprietary/vendor/lib64/mediadrm/libwvdrmengine.so differ diff --git a/sdm845-common-vendor.mk b/sdm845-common-vendor.mk index a565958..5685fe2 100644 --- a/sdm845-common-vendor.mk +++ b/sdm845-common-vendor.mk @@ -54,7 +54,7 @@ PRODUCT_COPY_FILES += \ vendor/xiaomi/sdm845-common/proprietary/vendor/etc/default-permissions/com.qualcomm.qti.cne.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default-permissions/com.qualcomm.qti.cne.xml \ vendor/xiaomi/sdm845-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/xiaomi/sdm845-common/proprietary/vendor/etc/init/android.hardware.drm@1.1-service.wfdhdcp.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.drm@1.1-service.wfdhdcp.rc \ - vendor/xiaomi/sdm845-common/proprietary/vendor/etc/init/android.hardware.drm@1.2-service.widevine.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.drm@1.2-service.widevine.rc \ + vendor/xiaomi/sdm845-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/xiaomi/sdm845-common/proprietary/vendor/etc/init/android.hardware.gatekeeper@1.0-service-qti.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.gatekeeper@1.0-service-qti.rc \ vendor/xiaomi/sdm845-common/proprietary/vendor/etc/init/android.hardware.neuralnetworks@1.3-service-qti.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.neuralnetworks@1.3-service-qti.rc \ vendor/xiaomi/sdm845-common/proprietary/vendor/etc/init/cnd.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/cnd.rc \ @@ -539,6 +539,7 @@ PRODUCT_PACKAGES += \ qcrilhook \ android.hardware.neuralnetworks@1.3-service-qti-hta.xml \ android.hardware.neuralnetworks@1.3-service-qti.xml \ + manifest_android.hardware.drm@1.3-service.widevine.xml \ ATFWD-daemon \ adpl \ adsprpcd \ @@ -548,7 +549,7 @@ PRODUCT_PACKAGES += \ dpmQmiMgr \ hvdcp_opti \ android.hardware.bluetooth@1.0-service-qti \ - android.hardware.drm@1.2-service.widevine \ + android.hardware.drm@1.3-service.widevine \ android.hardware.gatekeeper@1.0-service-qti \ android.hardware.neuralnetworks@1.3-service-qti \ qcrild \