diff --git a/Android.bp b/Android.bp index b29ab9c..f182438 100644 --- a/Android.bp +++ b/Android.bp @@ -976,7 +976,7 @@ cc_prebuilt_library_shared { target: { android_arm64: { srcs: ["proprietary/vendor/lib64/hw/vendor.qti.hardware.wifidisplaysession@1.0-impl.so"], - shared_libs: ["libhidlbase", "libutils", "vendor.qti.hardware.wifidisplaysession@1.0", "libc++", "libc", "libm", "libdl", ], + shared_libs: ["libhidlbase", "libutils", "vendor.qti.hardware.wifidisplaysession@1.0-vendor", "libc++", "libc", "libm", "libdl", ], }, }, compile_multilib: "64", @@ -6099,7 +6099,7 @@ cc_prebuilt_library_shared { target: { android_arm64: { srcs: ["proprietary/vendor/lib64/libwfdsessionmodule.so"], - shared_libs: ["libmmosal_vendor", "liblog", "libutils", "libwfdsourcesession_proprietary", "vendor.qti.hardware.wifidisplaysession@1.0", "libwfdcommonutils_proprietary", "libhidlbase", "libc++", "libc", "libm", "libdl", ], + shared_libs: ["libmmosal_vendor", "liblog", "libutils", "libwfdsourcesession_proprietary", "vendor.qti.hardware.wifidisplaysession@1.0-vendor", "libwfdcommonutils_proprietary", "libhidlbase", "libc++", "libc", "libm", "libdl", ], }, }, compile_multilib: "64", @@ -8565,7 +8565,8 @@ cc_prebuilt_library_shared { } cc_prebuilt_library_shared { - name: "vendor.qti.hardware.wifidisplaysession@1.0", + name: "vendor.qti.hardware.wifidisplaysession@1.0-vendor", + stem: "vendor.qti.hardware.wifidisplaysession@1.0", owner: "xiaomi", strip: { none: true, @@ -8590,7 +8591,7 @@ cc_prebuilt_library_shared { target: { android_arm64: { srcs: ["proprietary/vendor/lib64/vendor.qti.hardware.wifidisplaysessionl@1.0-halimpl.so"], - shared_libs: ["libhidlbase", "libutils", "libcutils", "vendor.qti.hardware.wifidisplaysession@1.0", "libwfdsessionmodule", "liblog", "libc++", "libc", "libm", "libdl", ], + shared_libs: ["libhidlbase", "libutils", "libcutils", "vendor.qti.hardware.wifidisplaysession@1.0-vendor", "libwfdsessionmodule", "liblog", "libc++", "libc", "libm", "libdl", ], }, }, compile_multilib: "64", @@ -9347,6 +9348,40 @@ cc_prebuilt_library_shared { system_ext_specific: true, } +cc_prebuilt_library_shared { + name: "libmmosal", + owner: "xiaomi", + strip: { + none: true, + }, + target: { + android_arm64: { + srcs: ["proprietary/system_ext/lib64/libmmosal.so"], + shared_libs: ["libutils", "libcutils", "liblog", "libc++", "libc", "libm", "libdl", ], + }, + }, + compile_multilib: "64", + prefer: true, + system_ext_specific: true, +} + +cc_prebuilt_library_shared { + name: "libmmparser_lite", + owner: "xiaomi", + strip: { + none: true, + }, + target: { + android_arm64: { + srcs: ["proprietary/system_ext/lib64/libmmparser_lite.so"], + shared_libs: ["libutils", "libcutils", "liblog", "libmmosal", "libc++", "libc", "libm", "libdl", ], + }, + }, + compile_multilib: "64", + prefer: true, + system_ext_specific: true, +} + cc_prebuilt_library_shared { name: "libmmrtpdecoder", owner: "xiaomi", @@ -9449,6 +9484,23 @@ cc_prebuilt_library_shared { system_ext_specific: true, } +cc_prebuilt_library_shared { + name: "libwfdavenhancements", + owner: "xiaomi", + strip: { + none: true, + }, + target: { + android_arm64: { + srcs: ["proprietary/system_ext/lib64/libwfdavenhancements.so"], + shared_libs: ["liblog", "libbinder", "libutils", "libgui", "libui", "libstagefright_foundation", "libc++", "libc", "libm", "libdl", ], + }, + }, + compile_multilib: "64", + prefer: true, + system_ext_specific: true, +} + cc_prebuilt_library_shared { name: "libwfdclient", owner: "xiaomi", @@ -9551,6 +9603,23 @@ cc_prebuilt_library_shared { system_ext_specific: true, } +cc_prebuilt_library_shared { + name: "libwfdmmsrc_system", + owner: "xiaomi", + strip: { + none: true, + }, + target: { + android_arm64: { + srcs: ["proprietary/system_ext/lib64/libwfdmmsrc_system.so"], + shared_libs: ["libbinder", "libmmosal", "liblog", "libutils", "libcutils", "libgui", "libui", "libwfdcommonutils", "libwfdconfigutils", "libinput", "libwfdmminterface", "libwfddisplayconfig", "libmedia_helper", "libaudioclient", "libwfdavenhancements", "libhidlbase", "libgralloctypes", "android.hardware.graphics.mapper@4.0", "libc++", "libc", "libm", "libdl", ], + }, + }, + compile_multilib: "64", + prefer: true, + system_ext_specific: true, +} + cc_prebuilt_library_shared { name: "libwfdnative", owner: "xiaomi", @@ -9585,6 +9654,23 @@ cc_prebuilt_library_shared { system_ext_specific: true, } +cc_prebuilt_library_shared { + name: "libwfdservice", + owner: "xiaomi", + strip: { + none: true, + }, + target: { + android_arm64: { + srcs: ["proprietary/system_ext/lib64/libwfdservice.so"], + shared_libs: ["liblog", "libutils", "libcutils", "libbinder", "libgui", "libwfdsinksm", "libmmosal", "libwfdcommonutils", "libwfdconfigutils", "libinput", "libwfdmminterface", "libmedia_helper", "libaudioclient", "libaudiofoundation", "audioclient-types-aidl-cpp", "android.media.audio.common.types-V2-cpp", "libwfdmmsrc_system", "libwfdavenhancements", "libhidlbase", "vendor.qti.hardware.wifidisplaysession@1.0", "libc++", "libc", "libm", "libdl", ], + }, + }, + compile_multilib: "64", + prefer: true, + system_ext_specific: true, +} + cc_prebuilt_library_shared { name: "libwfdsinksm", owner: "xiaomi", @@ -9857,6 +9943,23 @@ cc_prebuilt_library_shared { system_ext_specific: true, } +cc_prebuilt_library_shared { + name: "vendor.qti.hardware.wifidisplaysession@1.0", + owner: "xiaomi", + strip: { + none: true, + }, + target: { + android_arm64: { + srcs: ["proprietary/system_ext/lib64/vendor.qti.hardware.wifidisplaysession@1.0.so"], + shared_libs: ["libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ], + }, + }, + compile_multilib: "64", + prefer: true, + system_ext_specific: true, +} + cc_prebuilt_library_shared { name: "vendor.qti.imsrtpservice@3.0", owner: "xiaomi", @@ -12038,7 +12141,7 @@ cc_prebuilt_binary { target: { android_arm64: { srcs: ["proprietary/vendor/bin/wifidisplayhalservice"], - shared_libs: ["vendor.qti.hardware.wifidisplaysession@1.0", "vendor.qti.hardware.wifidisplaysessionl@1.0-halimpl", "libhidlbase", "libutils", "liblog", "libbinder", "libavservices_minijail", "libc++", "libc", "libm", "libdl", ], + shared_libs: ["vendor.qti.hardware.wifidisplaysession@1.0-vendor", "vendor.qti.hardware.wifidisplaysessionl@1.0-halimpl", "libhidlbase", "libutils", "liblog", "libbinder", "libavservices_minijail", "libc++", "libc", "libm", "libdl", ], }, }, compile_multilib: "64", @@ -12118,15 +12221,15 @@ cc_prebuilt_binary { } cc_prebuilt_binary { - name: "wfdservice", + name: "wfdservice64", owner: "xiaomi", target: { - android_arm: { - srcs: ["proprietary/system_ext/bin/wfdservice"], + android_arm64: { + srcs: ["proprietary/system_ext/bin/wfdservice64"], shared_libs: ["liblog", "libutils", "libcutils", "libbinder", "libwfdservice", "libmmosal", "libwfdcommonutils", "libwfdconfigutils", "libhidlbase", "libavservices_minijail", "libc++", "libc", "libm", "libdl", ], }, }, - compile_multilib: "32", + compile_multilib: "64", strip: { none: true, }, diff --git a/proprietary/system_ext/bin/wfdservice b/proprietary/system_ext/bin/wfdservice deleted file mode 100755 index aa51c2c..0000000 Binary files a/proprietary/system_ext/bin/wfdservice and /dev/null differ diff --git a/proprietary/system_ext/bin/wfdservice64 b/proprietary/system_ext/bin/wfdservice64 new file mode 100755 index 0000000..2fd239e Binary files /dev/null and b/proprietary/system_ext/bin/wfdservice64 differ diff --git a/proprietary/system_ext/etc/seccomp_policy/wfdservice.policy b/proprietary/system_ext/etc/seccomp_policy/wfdservice64.policy similarity index 84% rename from proprietary/system_ext/etc/seccomp_policy/wfdservice.policy rename to proprietary/system_ext/etc/seccomp_policy/wfdservice64.policy index 09d5a83..98b3c11 100644 --- a/proprietary/system_ext/etc/seccomp_policy/wfdservice.policy +++ b/proprietary/system_ext/etc/seccomp_policy/wfdservice64.policy @@ -1,4 +1,4 @@ -# Copyright (c) 2020-2021 Qualcomm Technologies, Inc. +# Copyright (c) 2021, 2022 Qualcomm Technologies, Inc. # All Rights Reserved. # Confidential and Proprietary - Qualcomm Technologies, Inc # @@ -18,7 +18,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -mmap2: arg2 in ~PROT_EXEC || arg2 in ~PROT_WRITE +mmap: arg2 in ~PROT_EXEC || arg2 in ~PROT_WRITE mprotect: arg2 in ~PROT_EXEC || arg2 in ~PROT_WRITE munmap: 1 futex: 1 @@ -29,19 +29,19 @@ ioctl: 1 close: 1 openat: 1 mremap: 1 -fstat64: 1 +fstat: 1 readlinkat: 1 pread64: 1 -fstatfs64: 1 +fstatfs: 1 clock_gettime: 1 -fstatat64: 1 +fstatat: 1 read: 1 write: 1 -fcntl64: 1 +fcntl: 1 ppoll: 1 faccessat: 1 rt_sigaction: 1 -getuid32: 1 +getuid: 1 madvise: 1 rt_sigprocmask: 1 writev: 1 @@ -49,8 +49,9 @@ personality: 1 getrandom: 1 gettimeofday: 1 #set_tls: 1 -statfs64: 1 +statfs: 1 ugetrlimit: 1 +getrlimit: 1 execve: 1 connect: 1 socket: arg0 == AF_UNIX @@ -76,3 +77,10 @@ getdents64: 1 dup: 1 lseek: 1 tgkill: 1 +process_vm_readv: 1 +memfd_create: 1 +eventfd2: 1 +epoll_create1: 1 +epoll_ctl: 1 +recvfrom: 1 +epoll_pwait: 1 diff --git a/proprietary/system_ext/lib64/libmmosal.so b/proprietary/system_ext/lib64/libmmosal.so new file mode 100644 index 0000000..e74a916 Binary files /dev/null and b/proprietary/system_ext/lib64/libmmosal.so differ diff --git a/proprietary/system_ext/lib64/libmmparser_lite.so b/proprietary/system_ext/lib64/libmmparser_lite.so new file mode 100644 index 0000000..39e606c Binary files /dev/null and b/proprietary/system_ext/lib64/libmmparser_lite.so differ diff --git a/proprietary/system_ext/lib64/libwfdavenhancements.so b/proprietary/system_ext/lib64/libwfdavenhancements.so new file mode 100644 index 0000000..abc3ee4 Binary files /dev/null and b/proprietary/system_ext/lib64/libwfdavenhancements.so differ diff --git a/proprietary/system_ext/lib64/libwfdmmsrc_system.so b/proprietary/system_ext/lib64/libwfdmmsrc_system.so new file mode 100644 index 0000000..46beed4 Binary files /dev/null and b/proprietary/system_ext/lib64/libwfdmmsrc_system.so differ diff --git a/proprietary/system_ext/lib64/libwfdservice.so b/proprietary/system_ext/lib64/libwfdservice.so new file mode 100644 index 0000000..aec8a5a Binary files /dev/null and b/proprietary/system_ext/lib64/libwfdservice.so differ diff --git a/proprietary/system_ext/lib64/vendor.qti.hardware.wifidisplaysession@1.0.so b/proprietary/system_ext/lib64/vendor.qti.hardware.wifidisplaysession@1.0.so new file mode 100644 index 0000000..d203a15 Binary files /dev/null and b/proprietary/system_ext/lib64/vendor.qti.hardware.wifidisplaysession@1.0.so differ diff --git a/sm8450-common-vendor.mk b/sm8450-common-vendor.mk index 7c30113..be9eb72 100644 --- a/sm8450-common-vendor.mk +++ b/sm8450-common-vendor.mk @@ -24,7 +24,7 @@ PRODUCT_COPY_FILES += \ vendor/xiaomi/sm8450-common/proprietary/system_ext/etc/permissions/vendor.qti.ims.rcsservice.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/vendor.qti.ims.rcsservice.xml \ vendor/xiaomi/sm8450-common/proprietary/system_ext/etc/permissions/wfd-system-ext-privapp-permissions-qti.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/wfd-system-ext-privapp-permissions-qti.xml \ vendor/xiaomi/sm8450-common/proprietary/system_ext/etc/seccomp_policy/tcmd.policy:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/seccomp_policy/tcmd.policy \ - vendor/xiaomi/sm8450-common/proprietary/system_ext/etc/seccomp_policy/wfdservice.policy:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/seccomp_policy/wfdservice.policy \ + vendor/xiaomi/sm8450-common/proprietary/system_ext/etc/seccomp_policy/wfdservice64.policy:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/seccomp_policy/wfdservice64.policy \ vendor/xiaomi/sm8450-common/proprietary/system_ext/etc/sysconfig/qti_telephony_system_packages_config.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/sysconfig/qti_telephony_system_packages_config.xml \ vendor/xiaomi/sm8450-common/proprietary/system_ext/etc/sysconfig/qti_whitelist_system_ext.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/sysconfig/qti_whitelist_system_ext.xml \ vendor/xiaomi/sm8450-common/proprietary/system_ext/etc/wfdconfigsink.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/wfdconfigsink.xml \ @@ -757,7 +757,7 @@ PRODUCT_PACKAGES += \ vendor.qti.hardware.vpp@1.2 \ vendor.qti.hardware.vpp@1.3 \ vendor.qti.hardware.vpp@2.0 \ - vendor.qti.hardware.wifidisplaysession@1.0 \ + vendor.qti.hardware.wifidisplaysession@1.0-vendor \ vendor.qti.hardware.wifidisplaysessionl@1.0-halimpl \ vendor.qti.ims.callcapability@1.0 \ vendor.qti.ims.callinfo@1.0 \ @@ -803,20 +803,25 @@ PRODUCT_PACKAGES += \ libdpmtcm \ libimscamera_jni \ libimsmedia_jni \ + libmmosal \ + libmmparser_lite \ libmmrtpdecoder \ libmmrtpencoder \ libqcc \ libqcc_file_agent_sys \ libqccdme \ libqccfileservice \ + libwfdavenhancements \ libwfdclient \ libwfdcommonutils \ libwfdconfigutils \ libwfddisplayconfig \ libwfdmminterface \ libwfdmmsink \ + libwfdmmsrc_system \ libwfdnative \ libwfdrtsp \ + libwfdservice \ libwfdsinksm \ libwfduibcinterface \ libwfduibcsink \ @@ -833,6 +838,7 @@ PRODUCT_PACKAGES += \ vendor.qti.hardware.qccsyshal@1.2-halimpl \ vendor.qti.hardware.qccsyshal@1.2 \ vendor.qti.hardware.qccvndhal@1.0 \ + vendor.qti.hardware.wifidisplaysession@1.0 \ vendor.qti.imsrtpservice@3.0 \ vendor.qti.imsrtpservice@3.1 \ vendor.qti.qccvndhal_aidl-V1-ndk \ @@ -993,7 +999,7 @@ PRODUCT_PACKAGES += \ dpmd \ qccsyshal@1.2-service \ tcmd \ - wfdservice + wfdservice64 PRODUCT_PACKAGES += \ libimscamera_jni_libimscamera_jni_symlink64 \