diff --git a/curtana-vendor.mk b/curtana-vendor.mk index 6c9ec8d..6d85ac2 100644 --- a/curtana-vendor.mk +++ b/curtana-vendor.mk @@ -152,7 +152,7 @@ PRODUCT_COPY_FILES += \ vendor/xiaomi/curtana/proprietary/vendor/bin/garden_app:$(TARGET_COPY_OUT_VENDOR)/bin/garden_app \ vendor/xiaomi/curtana/proprietary/vendor/bin/hvdcp_opti:$(TARGET_COPY_OUT_VENDOR)/bin/hvdcp_opti \ vendor/xiaomi/curtana/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/curtana/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/curtana/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/curtana/proprietary/vendor/bin/hw/android.hardware.gatekeeper@1.0-service-qti:$(TARGET_COPY_OUT_VENDOR)/bin/hw/android.hardware.gatekeeper@1.0-service-qti \ vendor/xiaomi/curtana/proprietary/vendor/bin/hw/android.hardware.health@2.0-service:$(TARGET_COPY_OUT_VENDOR)/bin/hw/android.hardware.health@2.0-service \ vendor/xiaomi/curtana/proprietary/vendor/bin/hw/android.hardware.keymaster@4.0-service-qti:$(TARGET_COPY_OUT_VENDOR)/bin/hw/android.hardware.keymaster@4.0-service-qti \ @@ -272,7 +272,7 @@ PRODUCT_COPY_FILES += \ vendor/xiaomi/curtana/proprietary/vendor/etc/gpfspath_oem_config.xml:$(TARGET_COPY_OUT_VENDOR)/etc/gpfspath_oem_config.xml \ vendor/xiaomi/curtana/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/curtana/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/curtana/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/curtana/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/curtana/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/curtana/proprietary/vendor/etc/init/android.hardware.health@2.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.health@2.0-service.rc \ vendor/xiaomi/curtana/proprietary/vendor/etc/init/android.hardware.keymaster@4.0-service-qti.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.keymaster@4.0-service-qti.rc \ @@ -352,6 +352,7 @@ PRODUCT_COPY_FILES += \ vendor/xiaomi/curtana/proprietary/vendor/etc/sensors/config/sns_wrist_pedo.json:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/config/sns_wrist_pedo.json \ vendor/xiaomi/curtana/proprietary/vendor/etc/sensors/hals.conf:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/hals.conf \ vendor/xiaomi/curtana/proprietary/vendor/etc/sensors/sns_reg_config:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/sns_reg_config \ + vendor/xiaomi/curtana/proprietary/vendor/etc/vintf/manifest/manifest_android.hardware.drm@1.3-service.widevine.xml:$(TARGET_COPY_OUT_VENDOR)/etc/vintf/manifest/manifest_android.hardware.drm@1.3-service.widevine.xml \ vendor/xiaomi/curtana/proprietary/vendor/etc/vintf/manifest/vendor.qti.gnss@3.0-service.xml:$(TARGET_COPY_OUT_VENDOR)/etc/vintf/manifest/vendor.qti.gnss@3.0-service.xml \ vendor/xiaomi/curtana/proprietary/vendor/etc/wfdconfig.xml:$(TARGET_COPY_OUT_VENDOR)/etc/wfdconfig.xml \ vendor/xiaomi/curtana/proprietary/vendor/etc/xtra_root_cert.pem:$(TARGET_COPY_OUT_VENDOR)/etc/xtra_root_cert.pem \ @@ -538,7 +539,6 @@ PRODUCT_COPY_FILES += \ vendor/xiaomi/curtana/proprietary/vendor/lib/libcdsp_default_listener.so:$(TARGET_COPY_OUT_VENDOR)/lib/libcdsp_default_listener.so \ vendor/xiaomi/curtana/proprietary/vendor/lib/libcdsprpc.so:$(TARGET_COPY_OUT_VENDOR)/lib/libcdsprpc.so \ vendor/xiaomi/curtana/proprietary/vendor/lib/libcpion.so:$(TARGET_COPY_OUT_VENDOR)/lib/libcpion.so \ - vendor/xiaomi/curtana/proprietary/vendor/lib/libcppf.so:$(TARGET_COPY_OUT_VENDOR)/lib/libcppf.so \ vendor/xiaomi/curtana/proprietary/vendor/lib/libdiag.so:$(TARGET_COPY_OUT_VENDOR)/lib/libdiag.so \ vendor/xiaomi/curtana/proprietary/vendor/lib/libdrc.so:$(TARGET_COPY_OUT_VENDOR)/lib/libdrc.so \ vendor/xiaomi/curtana/proprietary/vendor/lib/libdrmfs.so:$(TARGET_COPY_OUT_VENDOR)/lib/libdrmfs.so \ @@ -584,7 +584,6 @@ PRODUCT_COPY_FILES += \ vendor/xiaomi/curtana/proprietary/vendor/lib/libqmiservices.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqmiservices.so \ vendor/xiaomi/curtana/proprietary/vendor/lib/libqseed3.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqseed3.so \ vendor/xiaomi/curtana/proprietary/vendor/lib/libqtigef.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqtigef.so \ - vendor/xiaomi/curtana/proprietary/vendor/lib/librmp.so:$(TARGET_COPY_OUT_VENDOR)/lib/librmp.so \ vendor/xiaomi/curtana/proprietary/vendor/lib/libsdedrm.so:$(TARGET_COPY_OUT_VENDOR)/lib/libsdedrm.so \ vendor/xiaomi/curtana/proprietary/vendor/lib/libsdm-color.so:$(TARGET_COPY_OUT_VENDOR)/lib/libsdm-color.so \ vendor/xiaomi/curtana/proprietary/vendor/lib/libsdm-colormgr-algo.so:$(TARGET_COPY_OUT_VENDOR)/lib/libsdm-colormgr-algo.so \ @@ -597,7 +596,6 @@ PRODUCT_COPY_FILES += \ vendor/xiaomi/curtana/proprietary/vendor/lib/libsurround_3mic_proc.so:$(TARGET_COPY_OUT_VENDOR)/lib/libsurround_3mic_proc.so \ vendor/xiaomi/curtana/proprietary/vendor/lib/libsystem_health_mon.so:$(TARGET_COPY_OUT_VENDOR)/lib/libsystem_health_mon.so \ vendor/xiaomi/curtana/proprietary/vendor/lib/libtinyxml2_1.so:$(TARGET_COPY_OUT_VENDOR)/lib/libtinyxml2_1.so \ - vendor/xiaomi/curtana/proprietary/vendor/lib/libtrustedapploader.so:$(TARGET_COPY_OUT_VENDOR)/lib/libtrustedapploader.so \ vendor/xiaomi/curtana/proprietary/vendor/lib/libvppclient.so:$(TARGET_COPY_OUT_VENDOR)/lib/libvppclient.so \ vendor/xiaomi/curtana/proprietary/vendor/lib/libvpphvx.so:$(TARGET_COPY_OUT_VENDOR)/lib/libvpphvx.so \ vendor/xiaomi/curtana/proprietary/vendor/lib/libvpplibrary.so:$(TARGET_COPY_OUT_VENDOR)/lib/libvpplibrary.so \ @@ -622,8 +620,6 @@ PRODUCT_COPY_FILES += \ vendor/xiaomi/curtana/proprietary/vendor/lib/libwfduibcsinkinterface_proprietary.so:$(TARGET_COPY_OUT_VENDOR)/lib/libwfduibcsinkinterface_proprietary.so \ vendor/xiaomi/curtana/proprietary/vendor/lib/libwfduibcsrc_proprietary.so:$(TARGET_COPY_OUT_VENDOR)/lib/libwfduibcsrc_proprietary.so \ vendor/xiaomi/curtana/proprietary/vendor/lib/libwfduibcsrcinterface_proprietary.so:$(TARGET_COPY_OUT_VENDOR)/lib/libwfduibcsrcinterface_proprietary.so \ - vendor/xiaomi/curtana/proprietary/vendor/lib/libwvhidl.so:$(TARGET_COPY_OUT_VENDOR)/lib/libwvhidl.so \ - vendor/xiaomi/curtana/proprietary/vendor/lib/mediadrm/libwvdrmengine.so:$(TARGET_COPY_OUT_VENDOR)/lib/mediadrm/libwvdrmengine.so \ vendor/xiaomi/curtana/proprietary/vendor/lib/rfsa/adsp/libSuperSensor_skel.so:$(TARGET_COPY_OUT_VENDOR)/lib/rfsa/adsp/libSuperSensor_skel.so \ vendor/xiaomi/curtana/proprietary/vendor/lib/rfsa/adsp/libVC1Dec.so:$(TARGET_COPY_OUT_VENDOR)/lib/rfsa/adsp/libVC1Dec.so \ vendor/xiaomi/curtana/proprietary/vendor/lib/rfsa/adsp/libVC1DecDsp_skel.so:$(TARGET_COPY_OUT_VENDOR)/lib/rfsa/adsp/libVC1DecDsp_skel.so \ @@ -1022,7 +1018,6 @@ PRODUCT_COPY_FILES += \ vendor/xiaomi/curtana/proprietary/vendor/lib64/libril-qc-radioconfig.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libril-qc-radioconfig.so \ vendor/xiaomi/curtana/proprietary/vendor/lib64/libril-qcril-hook-oem.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libril-qcril-hook-oem.so \ vendor/xiaomi/curtana/proprietary/vendor/lib64/librilqmiservices.so:$(TARGET_COPY_OUT_VENDOR)/lib64/librilqmiservices.so \ - vendor/xiaomi/curtana/proprietary/vendor/lib64/librmp.so:$(TARGET_COPY_OUT_VENDOR)/lib64/librmp.so \ vendor/xiaomi/curtana/proprietary/vendor/lib64/librpmb.so:$(TARGET_COPY_OUT_VENDOR)/lib64/librpmb.so \ vendor/xiaomi/curtana/proprietary/vendor/lib64/libscveBlobDescriptor.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libscveBlobDescriptor.so \ vendor/xiaomi/curtana/proprietary/vendor/lib64/libscveBlobDescriptor_stub.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libscveBlobDescriptor_stub.so \ @@ -1069,7 +1064,6 @@ PRODUCT_COPY_FILES += \ vendor/xiaomi/curtana/proprietary/vendor/lib64/libtinyxml2_1.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libtinyxml2_1.so \ vendor/xiaomi/curtana/proprietary/vendor/lib64/libtriplecam_optical_zoom_control.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libtriplecam_optical_zoom_control.so \ vendor/xiaomi/curtana/proprietary/vendor/lib64/libtriplecam_video_optical_zoom.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libtriplecam_video_optical_zoom.so \ - vendor/xiaomi/curtana/proprietary/vendor/lib64/libtrustedapploader.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libtrustedapploader.so \ vendor/xiaomi/curtana/proprietary/vendor/lib64/libvendor.goodix.hardware.biometrics.fingerprint@2.1.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libvendor.goodix.hardware.biometrics.fingerprint@2.1.so \ vendor/xiaomi/curtana/proprietary/vendor/lib64/libvideofilter_only.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libvideofilter_only.so \ vendor/xiaomi/curtana/proprietary/vendor/lib64/libvidhance.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libvidhance.so \ @@ -1080,11 +1074,11 @@ PRODUCT_COPY_FILES += \ vendor/xiaomi/curtana/proprietary/vendor/lib64/libwfdhdcpcp.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libwfdhdcpcp.so \ vendor/xiaomi/curtana/proprietary/vendor/lib64/libwms.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libwms.so \ vendor/xiaomi/curtana/proprietary/vendor/lib64/libwqe.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libwqe.so \ + vendor/xiaomi/curtana/proprietary/vendor/lib64/libwvhidl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libwvhidl.so \ vendor/xiaomi/curtana/proprietary/vendor/lib64/libxmi_high_dynamic_range.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libxmi_high_dynamic_range.so \ vendor/xiaomi/curtana/proprietary/vendor/lib64/libxml.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libxml.so \ vendor/xiaomi/curtana/proprietary/vendor/lib64/libxml2_vendor.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libxml2_vendor.so \ vendor/xiaomi/curtana/proprietary/vendor/lib64/libxtadapter.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libxtadapter.so \ - vendor/xiaomi/curtana/proprietary/vendor/lib64/mediadrm/libwvdrmengine.so:$(TARGET_COPY_OUT_VENDOR)/lib64/mediadrm/libwvdrmengine.so \ vendor/xiaomi/curtana/proprietary/vendor/lib64/qcrild_librilutils.so:$(TARGET_COPY_OUT_VENDOR)/lib64/qcrild_librilutils.so \ vendor/xiaomi/curtana/proprietary/vendor/lib64/qtibus.so:$(TARGET_COPY_OUT_VENDOR)/lib64/qtibus.so \ vendor/xiaomi/curtana/proprietary/vendor/lib64/qtimutex.so:$(TARGET_COPY_OUT_VENDOR)/lib64/qtimutex.so \ diff --git a/proprietary/product/priv-app/HotwordEnrollmentOKGoogleHEXAGON/HotwordEnrollmentOKGoogleHEXAGON.apk b/proprietary/product/priv-app/HotwordEnrollmentOKGoogleHEXAGON/HotwordEnrollmentOKGoogleHEXAGON.apk new file mode 100644 index 0000000..fec5535 Binary files /dev/null and b/proprietary/product/priv-app/HotwordEnrollmentOKGoogleHEXAGON/HotwordEnrollmentOKGoogleHEXAGON.apk differ diff --git a/proprietary/product/priv-app/HotwordEnrollmentXGoogleHEXAGON/HotwordEnrollmentXGoogleHEXAGON.apk b/proprietary/product/priv-app/HotwordEnrollmentXGoogleHEXAGON/HotwordEnrollmentXGoogleHEXAGON.apk new file mode 100644 index 0000000..ba85072 Binary files /dev/null and b/proprietary/product/priv-app/HotwordEnrollmentXGoogleHEXAGON/HotwordEnrollmentXGoogleHEXAGON.apk 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..90082fc 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.3-service.widevine.rc b/proprietary/vendor/etc/init/android.hardware.drm@1.3-service.widevine.rc new file mode 100644 index 0000000..9086730 --- /dev/null +++ b/proprietary/vendor/etc/init/android.hardware.drm@1.3-service.widevine.rc @@ -0,0 +1,26 @@ +on property:init.svc.mediadrm=running + mkdir /data/vendor/mediadrm 0770 media mediadrm + start vendor.move_data_sh + +service vendor.move_data_sh /system/bin/move_widevine_data.sh + class late_start + user media + group media mediadrm system + disabled + oneshot + +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 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/lib/libbase64.so b/proprietary/vendor/lib/libbase64.so index 110cefe..79ff318 100644 Binary files a/proprietary/vendor/lib/libbase64.so and b/proprietary/vendor/lib/libbase64.so differ diff --git a/proprietary/vendor/lib/libcpion.so b/proprietary/vendor/lib/libcpion.so index fcd4782..786a543 100644 Binary files a/proprietary/vendor/lib/libcpion.so and b/proprietary/vendor/lib/libcpion.so differ diff --git a/proprietary/vendor/lib/libhdcp1prov.so b/proprietary/vendor/lib/libhdcp1prov.so index 31cade4..e3eff8b 100644 Binary files a/proprietary/vendor/lib/libhdcp1prov.so and b/proprietary/vendor/lib/libhdcp1prov.so differ diff --git a/proprietary/vendor/lib/libhdcp2p2prov.so b/proprietary/vendor/lib/libhdcp2p2prov.so index cb91bbf..7d5c2f5 100644 Binary files a/proprietary/vendor/lib/libhdcp2p2prov.so and b/proprietary/vendor/lib/libhdcp2p2prov.so differ diff --git a/proprietary/vendor/lib/libhdcpsrm.so b/proprietary/vendor/lib/libhdcpsrm.so index 2468672..06b9e54 100644 Binary files a/proprietary/vendor/lib/libhdcpsrm.so and b/proprietary/vendor/lib/libhdcpsrm.so differ diff --git a/proprietary/vendor/lib/libmm-hdcpmgr.so b/proprietary/vendor/lib/libmm-hdcpmgr.so index 5431ae6..53d1cfb 100644 Binary files a/proprietary/vendor/lib/libmm-hdcpmgr.so and b/proprietary/vendor/lib/libmm-hdcpmgr.so differ diff --git a/proprietary/vendor/lib/liboemcrypto.so b/proprietary/vendor/lib/liboemcrypto.so index c3098b8..b876e04 100644 Binary files a/proprietary/vendor/lib/liboemcrypto.so and b/proprietary/vendor/lib/liboemcrypto.so differ diff --git a/proprietary/vendor/lib64/libbase64.so b/proprietary/vendor/lib64/libbase64.so index 60b8aa8..e523f62 100644 Binary files a/proprietary/vendor/lib64/libbase64.so and b/proprietary/vendor/lib64/libbase64.so differ diff --git a/proprietary/vendor/lib64/libcpion.so b/proprietary/vendor/lib64/libcpion.so index 83b7aa3..96b4237 100644 Binary files a/proprietary/vendor/lib64/libcpion.so and b/proprietary/vendor/lib64/libcpion.so differ diff --git a/proprietary/vendor/lib64/libhdcp1prov.so b/proprietary/vendor/lib64/libhdcp1prov.so index f230103..a7f56cf 100644 Binary files a/proprietary/vendor/lib64/libhdcp1prov.so and b/proprietary/vendor/lib64/libhdcp1prov.so differ diff --git a/proprietary/vendor/lib64/libhdcp2p2prov.so b/proprietary/vendor/lib64/libhdcp2p2prov.so index 8d69b10..7edecf3 100644 Binary files a/proprietary/vendor/lib64/libhdcp2p2prov.so and b/proprietary/vendor/lib64/libhdcp2p2prov.so differ diff --git a/proprietary/vendor/lib64/libhdcpsrm.so b/proprietary/vendor/lib64/libhdcpsrm.so index 572c69a..a1daab9 100644 Binary files a/proprietary/vendor/lib64/libhdcpsrm.so and b/proprietary/vendor/lib64/libhdcpsrm.so differ diff --git a/proprietary/vendor/lib64/libmm-hdcpmgr.so b/proprietary/vendor/lib64/libmm-hdcpmgr.so index 7b1e67f..32c63b5 100644 Binary files a/proprietary/vendor/lib64/libmm-hdcpmgr.so and b/proprietary/vendor/lib64/libmm-hdcpmgr.so differ diff --git a/proprietary/vendor/lib64/liboemcrypto.so b/proprietary/vendor/lib64/liboemcrypto.so index fc653da..642cd1f 100644 Binary files a/proprietary/vendor/lib64/liboemcrypto.so and b/proprietary/vendor/lib64/liboemcrypto.so differ diff --git a/proprietary/vendor/lib64/libwvhidl.so b/proprietary/vendor/lib64/libwvhidl.so new file mode 100644 index 0000000..c52928b Binary files /dev/null and b/proprietary/vendor/lib64/libwvhidl.so differ