diff --git a/Android.bp b/Android.bp index bd770d6..132b4e4 100644 --- a/Android.bp +++ b/Android.bp @@ -3687,6 +3687,33 @@ cc_prebuilt_library_shared { soc_specific: true, } +cc_prebuilt_library_shared { + name: "libmm-hdcpmgr", + owner: "xiaomi", + strip: { + none: true, + }, + target: { + android_arm: { + srcs: [ + "proprietary/vendor/lib/libmm-hdcpmgr.so", + ], + shared_libs: [ + "liblog", + "libutils", + "libcutils", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "32", + prefer: true, + soc_specific: true, +} + cc_prebuilt_library_shared { name: "libmmosal_vendor", stem: "libmmosal", @@ -14265,34 +14292,20 @@ cc_prebuilt_binary { } cc_prebuilt_binary { - name: "wfdhdcphalservice", + name: "wfdvndservice", owner: "xiaomi", target: { android_arm: { srcs: [ - "proprietary/vendor/bin/wfdhdcphalservice", + "proprietary/vendor/bin/wfdvndservice", ], shared_libs: [ - "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", - "libhidlmemory", - "libc++", - "libhidlbase", - "libbinder", - "libbase", - "liblog", "libutils", - "libcutils", - "libwfdhdcpcp", + "liblog", + "libbinder", "libwfdhdcpservice_proprietary", - "libwfdcommonutils_proprietary", - "libwfdutils_proprietary", - "libqdMetaData", "libavservices_minijail", - "libwfddisplayconfig_proprietary", + "libc++", "libc", "libm", "libdl", diff --git a/proprietary/vendor/bin/wfdvndservice b/proprietary/vendor/bin/wfdvndservice new file mode 100755 index 0000000..1592ab9 Binary files /dev/null and b/proprietary/vendor/bin/wfdvndservice differ diff --git a/proprietary/vendor/bin/wifidisplayhalservice b/proprietary/vendor/bin/wifidisplayhalservice index b33e383..b7e54a7 100755 Binary files a/proprietary/vendor/bin/wifidisplayhalservice and b/proprietary/vendor/bin/wifidisplayhalservice differ diff --git a/proprietary/vendor/etc/init/wfdvndservice.rc b/proprietary/vendor/etc/init/wfdvndservice.rc new file mode 100644 index 0000000..c28e32b --- /dev/null +++ b/proprietary/vendor/etc/init/wfdvndservice.rc @@ -0,0 +1,10 @@ +# +# Copyright (c) 2019 Qualcomm Technologies, Inc. +# All Rights Reserved. +# Confidential and Proprietary - Qualcomm Technologies, Inc. +# + +service wfdvndservice /vendor/bin/wfdvndservice + class main + user system + group inet diff --git a/proprietary/vendor/lib/libFileMux_proprietary.so b/proprietary/vendor/lib/libFileMux_proprietary.so index e253a4a..f6ed1b4 100644 Binary files a/proprietary/vendor/lib/libFileMux_proprietary.so and b/proprietary/vendor/lib/libFileMux_proprietary.so differ diff --git a/proprietary/vendor/lib/libmm-hdcpmgr.so b/proprietary/vendor/lib/libmm-hdcpmgr.so new file mode 100644 index 0000000..5b67a77 Binary files /dev/null and b/proprietary/vendor/lib/libmm-hdcpmgr.so differ diff --git a/proprietary/vendor/lib/libmmosal.so b/proprietary/vendor/lib/libmmosal.so index a586140..2afadd6 100644 Binary files a/proprietary/vendor/lib/libmmosal.so and b/proprietary/vendor/lib/libmmosal.so differ diff --git a/proprietary/vendor/lib/libmmrtpdecoder_proprietary.so b/proprietary/vendor/lib/libmmrtpdecoder_proprietary.so index d5c9bc9..fc56cfa 100644 Binary files a/proprietary/vendor/lib/libmmrtpdecoder_proprietary.so and b/proprietary/vendor/lib/libmmrtpdecoder_proprietary.so differ diff --git a/proprietary/vendor/lib/libmmrtpencoder_proprietary.so b/proprietary/vendor/lib/libmmrtpencoder_proprietary.so index 2f210e6..7af226d 100644 Binary files a/proprietary/vendor/lib/libmmrtpencoder_proprietary.so and b/proprietary/vendor/lib/libmmrtpencoder_proprietary.so differ diff --git a/proprietary/vendor/lib/libwfdcommonutils_proprietary.so b/proprietary/vendor/lib/libwfdcommonutils_proprietary.so index e3d3d50..ca92fa8 100644 Binary files a/proprietary/vendor/lib/libwfdcommonutils_proprietary.so and b/proprietary/vendor/lib/libwfdcommonutils_proprietary.so differ diff --git a/proprietary/vendor/lib/libwfdconfigutils_proprietary.so b/proprietary/vendor/lib/libwfdconfigutils_proprietary.so index 0a17948..b6c1f2c 100644 Binary files a/proprietary/vendor/lib/libwfdconfigutils_proprietary.so and b/proprietary/vendor/lib/libwfdconfigutils_proprietary.so differ diff --git a/proprietary/vendor/lib/libwfddisplayconfig_proprietary.so b/proprietary/vendor/lib/libwfddisplayconfig_proprietary.so index 9e38da6..e7da707 100644 Binary files a/proprietary/vendor/lib/libwfddisplayconfig_proprietary.so and b/proprietary/vendor/lib/libwfddisplayconfig_proprietary.so differ diff --git a/proprietary/vendor/lib/libwfdhdcpcp.so b/proprietary/vendor/lib/libwfdhdcpcp.so index 17c6ee7..8b7f8af 100644 Binary files a/proprietary/vendor/lib/libwfdhdcpcp.so and b/proprietary/vendor/lib/libwfdhdcpcp.so differ diff --git a/proprietary/vendor/lib/libwfdhdcpservice_proprietary.so b/proprietary/vendor/lib/libwfdhdcpservice_proprietary.so index 91ce97b..f4dbbd0 100644 Binary files a/proprietary/vendor/lib/libwfdhdcpservice_proprietary.so and b/proprietary/vendor/lib/libwfdhdcpservice_proprietary.so differ diff --git a/proprietary/vendor/lib/libwfdmminterface_proprietary.so b/proprietary/vendor/lib/libwfdmminterface_proprietary.so index f30349b..ae568af 100644 Binary files a/proprietary/vendor/lib/libwfdmminterface_proprietary.so and b/proprietary/vendor/lib/libwfdmminterface_proprietary.so differ diff --git a/proprietary/vendor/lib/libwfdmmservice_proprietary.so b/proprietary/vendor/lib/libwfdmmservice_proprietary.so index 6fc025b..9f07e30 100644 Binary files a/proprietary/vendor/lib/libwfdmmservice_proprietary.so and b/proprietary/vendor/lib/libwfdmmservice_proprietary.so differ diff --git a/proprietary/vendor/lib/libwfdmmsrc_proprietary.so b/proprietary/vendor/lib/libwfdmmsrc_proprietary.so index b479b52..a54f11a 100644 Binary files a/proprietary/vendor/lib/libwfdmmsrc_proprietary.so and b/proprietary/vendor/lib/libwfdmmsrc_proprietary.so differ diff --git a/proprietary/vendor/lib/libwfdmodulehdcpsession.so b/proprietary/vendor/lib/libwfdmodulehdcpsession.so index b64d0f7..db0d709 100644 Binary files a/proprietary/vendor/lib/libwfdmodulehdcpsession.so and b/proprietary/vendor/lib/libwfdmodulehdcpsession.so differ diff --git a/proprietary/vendor/lib/libwfdrtsp_proprietary.so b/proprietary/vendor/lib/libwfdrtsp_proprietary.so index c155c42..0a2d745 100644 Binary files a/proprietary/vendor/lib/libwfdrtsp_proprietary.so and b/proprietary/vendor/lib/libwfdrtsp_proprietary.so differ diff --git a/proprietary/vendor/lib/libwfdsessionmodule.so b/proprietary/vendor/lib/libwfdsessionmodule.so index d04395d..3d6adef 100644 Binary files a/proprietary/vendor/lib/libwfdsessionmodule.so and b/proprietary/vendor/lib/libwfdsessionmodule.so differ diff --git a/proprietary/vendor/lib/libwfdsourcesession_proprietary.so b/proprietary/vendor/lib/libwfdsourcesession_proprietary.so index 2bd3067..fc5c8e1 100644 Binary files a/proprietary/vendor/lib/libwfdsourcesession_proprietary.so and b/proprietary/vendor/lib/libwfdsourcesession_proprietary.so differ diff --git a/proprietary/vendor/lib/libwfdsourcesm_proprietary.so b/proprietary/vendor/lib/libwfdsourcesm_proprietary.so index f28e524..50aefd1 100644 Binary files a/proprietary/vendor/lib/libwfdsourcesm_proprietary.so and b/proprietary/vendor/lib/libwfdsourcesm_proprietary.so differ diff --git a/proprietary/vendor/lib/libwfduibcinterface_proprietary.so b/proprietary/vendor/lib/libwfduibcinterface_proprietary.so index 5e7ad4c..52e77f4 100644 Binary files a/proprietary/vendor/lib/libwfduibcinterface_proprietary.so and b/proprietary/vendor/lib/libwfduibcinterface_proprietary.so differ diff --git a/proprietary/vendor/lib/libwfduibcsink_proprietary.so b/proprietary/vendor/lib/libwfduibcsink_proprietary.so index 338091d..f909dcd 100644 Binary files a/proprietary/vendor/lib/libwfduibcsink_proprietary.so and b/proprietary/vendor/lib/libwfduibcsink_proprietary.so differ diff --git a/proprietary/vendor/lib/libwfduibcsinkinterface_proprietary.so b/proprietary/vendor/lib/libwfduibcsinkinterface_proprietary.so index a497f17..a4e6353 100644 Binary files a/proprietary/vendor/lib/libwfduibcsinkinterface_proprietary.so and b/proprietary/vendor/lib/libwfduibcsinkinterface_proprietary.so differ diff --git a/proprietary/vendor/lib/libwfduibcsrc_proprietary.so b/proprietary/vendor/lib/libwfduibcsrc_proprietary.so index d2171a8..9ce96e0 100644 Binary files a/proprietary/vendor/lib/libwfduibcsrc_proprietary.so and b/proprietary/vendor/lib/libwfduibcsrc_proprietary.so differ diff --git a/proprietary/vendor/lib/libwfduibcsrcinterface_proprietary.so b/proprietary/vendor/lib/libwfduibcsrcinterface_proprietary.so index 74361f8..fe305ea 100644 Binary files a/proprietary/vendor/lib/libwfduibcsrcinterface_proprietary.so and b/proprietary/vendor/lib/libwfduibcsrcinterface_proprietary.so differ diff --git a/proprietary/vendor/lib/libwfdutils_proprietary.so b/proprietary/vendor/lib/libwfdutils_proprietary.so index ade6360..e112292 100644 Binary files a/proprietary/vendor/lib/libwfdutils_proprietary.so and b/proprietary/vendor/lib/libwfdutils_proprietary.so differ diff --git a/proprietary/vendor/lib/vendor.qti.hardware.wifidisplaysession@1.0.so b/proprietary/vendor/lib/vendor.qti.hardware.wifidisplaysession@1.0.so index 8dfca15..7c1ede5 100644 Binary files a/proprietary/vendor/lib/vendor.qti.hardware.wifidisplaysession@1.0.so and b/proprietary/vendor/lib/vendor.qti.hardware.wifidisplaysession@1.0.so differ diff --git a/proprietary/vendor/lib/vendor.qti.hardware.wifidisplaysessionl@1.0-halimpl.so b/proprietary/vendor/lib/vendor.qti.hardware.wifidisplaysessionl@1.0-halimpl.so index b770ae3..208fd11 100644 Binary files a/proprietary/vendor/lib/vendor.qti.hardware.wifidisplaysessionl@1.0-halimpl.so and b/proprietary/vendor/lib/vendor.qti.hardware.wifidisplaysessionl@1.0-halimpl.so differ diff --git a/sdm845-common-vendor.mk b/sdm845-common-vendor.mk index cf77612..d6883ad 100644 --- a/sdm845-common-vendor.mk +++ b/sdm845-common-vendor.mk @@ -88,6 +88,7 @@ PRODUCT_COPY_FILES += \ vendor/xiaomi/sdm845-common/proprietary/vendor/etc/init/vendor.qti.tftp.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.tftp.rc \ vendor/xiaomi/sdm845-common/proprietary/vendor/etc/init/vendor.xiaomi.hardware.mlipay@1.1-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.xiaomi.hardware.mlipay@1.1-service.rc \ vendor/xiaomi/sdm845-common/proprietary/vendor/etc/init/vppservice.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vppservice.rc \ + vendor/xiaomi/sdm845-common/proprietary/vendor/etc/init/wfdvndservice.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/wfdvndservice.rc \ vendor/xiaomi/sdm845-common/proprietary/vendor/etc/msm_irqbalance.conf:$(TARGET_COPY_OUT_VENDOR)/etc/msm_irqbalance.conf \ vendor/xiaomi/sdm845-common/proprietary/vendor/etc/permissions/vendor-qti-hardware-sensorscalibrate.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/vendor-qti-hardware-sensorscalibrate.xml \ vendor/xiaomi/sdm845-common/proprietary/vendor/etc/scve/facereco/gModel.dat:$(TARGET_COPY_OUT_VENDOR)/etc/scve/facereco/gModel.dat \ @@ -222,6 +223,7 @@ PRODUCT_PACKAGES += \ libhfp \ liblistenjni \ liblistensoundmodel2 \ + libmm-hdcpmgr \ libmmosal_vendor \ libmmrtpdecoder_proprietary \ libmmrtpencoder_proprietary \ @@ -593,7 +595,7 @@ PRODUCT_PACKAGES += \ thermal-engine \ time_daemon \ vppservice \ - wfdhdcphalservice \ + wfdvndservice \ wifidisplayhalservice \ dpmd \ wfdservice