diff --git a/Android.bp b/Android.bp index eee669c..f668140 100644 --- a/Android.bp +++ b/Android.bp @@ -165,6 +165,15 @@ dex_import { system_ext_specific: true, } +prebuilt_etc_xml { + name: "manifest_android.hardware.drm@1.3-service.widevine", + 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, +} + prebuilt_etc_xml { name: "vendor.qti.gnss@3.0-service", owner: "xiaomi", 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 100644 index 34b02f9..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 100644 index 0000000..544a6cf 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 79% 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..9086730 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,18 @@ 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 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 07bcf10..979d4cd 100644 Binary files a/proprietary/vendor/lib64/libwvhidl.so and b/proprietary/vendor/lib64/libwvhidl.so differ diff --git a/sdm660-common-vendor.mk b/sdm660-common-vendor.mk index 362b663..2225761 100644 --- a/sdm660-common-vendor.mk +++ b/sdm660-common-vendor.mk @@ -39,7 +39,7 @@ PRODUCT_COPY_FILES += \ vendor/xiaomi/sdm660-common/proprietary/vendor/bin/dpmQmiMgr:$(TARGET_COPY_OUT_VENDOR)/bin/dpmQmiMgr \ vendor/xiaomi/sdm660-common/proprietary/vendor/bin/hvdcp_opti:$(TARGET_COPY_OUT_VENDOR)/bin/hvdcp_opti \ vendor/xiaomi/sdm660-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/xiaomi/sdm660-common/proprietary/vendor/bin/hw/android.hardware.drm@1.2-service.widevine:$(TARGET_COPY_OUT_VENDOR)/bin/hw/android.hardware.drm@1.2-service.widevine \ + vendor/xiaomi/sdm660-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/xiaomi/sdm660-common/proprietary/vendor/bin/hw/qcrild:$(TARGET_COPY_OUT_VENDOR)/bin/hw/qcrild \ vendor/xiaomi/sdm660-common/proprietary/vendor/bin/hw/vendor.display.color@1.0-service:$(TARGET_COPY_OUT_VENDOR)/bin/hw/vendor.display.color@1.0-service \ vendor/xiaomi/sdm660-common/proprietary/vendor/bin/hw/vendor.qti.hardware.alarm@1.0-service:$(TARGET_COPY_OUT_VENDOR)/bin/hw/vendor.qti.hardware.alarm@1.0-service \ @@ -103,7 +103,7 @@ PRODUCT_COPY_FILES += \ vendor/xiaomi/sdm660-common/proprietary/vendor/etc/data/netmgr_config.xml:$(TARGET_COPY_OUT_VENDOR)/etc/data/netmgr_config.xml \ vendor/xiaomi/sdm660-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/sdm660-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/sdm660-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/sdm660-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/sdm660-common/proprietary/vendor/etc/init/cnd.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/cnd.rc \ vendor/xiaomi/sdm660-common/proprietary/vendor/etc/init/dataadpl.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/dataadpl.rc \ vendor/xiaomi/sdm660-common/proprietary/vendor/etc/init/dataqti.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/dataqti.rc \ @@ -491,6 +491,7 @@ PRODUCT_PACKAGES += \ dpmapi \ embmslibrary \ qcrilhook \ + manifest_android.hardware.drm@1.3-service.widevine \ vendor.qti.gnss@3.0-service ifeq ($(BOARD_HAVE_QCOM_FM),true)