From a526411ff2e2937b83d4a5cdb2b3f4a82cb59fc9 Mon Sep 17 00:00:00 2001 From: Cosmin Tanislav Date: Sat, 17 Aug 2024 02:03:24 +0300 Subject: [PATCH] sm8450-common: Fix vendor.qti.imsrtpservice@3.0 ELF checks Change-Id: Ia1995d0a3360317843685082e3226ab30f124d09 --- Android.bp | 18 ++++++++---------- sm8450-common-vendor.mk | 4 ++-- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/Android.bp b/Android.bp index d5bf11d..dcc3ace 100644 --- a/Android.bp +++ b/Android.bp @@ -1113,7 +1113,7 @@ cc_prebuilt_library_shared { target: { android_arm64: { srcs: ["proprietary/vendor/lib64/lib-imsvtcore.so"], - shared_libs: ["librcc", "libion", "libhidlbase", "vendor.qti.imsrtpservice@3.0", "vendor.qti.imsrtpservice@3.0-service-Impl", "libdiag", "libcutils", "libutils", "liblog", "libc++", "libc", "libm", "libdl", ], + shared_libs: ["librcc", "libion", "libhidlbase", "vendor.qti.imsrtpservice@3.0-vendor", "vendor.qti.imsrtpservice@3.0-service-Impl", "libdiag", "libcutils", "libutils", "liblog", "libc++", "libc", "libm", "libdl", ], }, }, compile_multilib: "64", @@ -2423,7 +2423,7 @@ cc_prebuilt_library_shared { target: { android_arm64: { srcs: ["proprietary/vendor/lib64/libgrpc++_unsecure_prebuilt.so"], - shared_libs: ["liblog", "libc++", "libc", "libm", "libdl", ], + shared_libs: ["libz", "liblog", "libc++", "libc", "libm", "libdl", ], }, }, compile_multilib: "64", @@ -8943,7 +8943,7 @@ cc_prebuilt_library_shared { target: { android_arm64: { srcs: ["proprietary/vendor/lib64/vendor.qti.imsrtpservice@3.0-service-Impl.so"], - shared_libs: ["liblog", "libcutils", "libbase", "libutils", "libhardware_legacy", "libhardware", "libhidlbase", "libdiag", "vendor.qti.imsrtpservice@3.0", "libc++", "libc", "libm", "libdl", ], + shared_libs: ["liblog", "libcutils", "libbase", "libutils", "libhardware_legacy", "libhardware", "libhidlbase", "libdiag", "vendor.qti.imsrtpservice@3.0-vendor", "libc++", "libc", "libm", "libdl", ], }, }, compile_multilib: "64", @@ -8952,7 +8952,8 @@ cc_prebuilt_library_shared { } cc_prebuilt_library_shared { - name: "vendor.qti.imsrtpservice@3.0", + name: "vendor.qti.imsrtpservice@3.0-vendor", + stem: "vendor.qti.imsrtpservice@3.0", owner: "xiaomi", strip: { none: true, @@ -9186,7 +9187,6 @@ cc_prebuilt_library_shared { }, }, compile_multilib: "64", - check_elf_files: false, prefer: true, system_ext_specific: true, } @@ -9861,8 +9861,7 @@ cc_prebuilt_library_shared { } cc_prebuilt_library_shared { - name: "vendor.qti.imsrtpservice@3.0-se", - stem: "vendor.qti.imsrtpservice@3.0", + name: "vendor.qti.imsrtpservice@3.0", owner: "xiaomi", strip: { none: true, @@ -9891,7 +9890,6 @@ cc_prebuilt_library_shared { }, }, compile_multilib: "64", - check_elf_files: false, prefer: true, system_ext_specific: true, } @@ -11091,7 +11089,7 @@ cc_prebuilt_binary { target: { android_arm64: { srcs: ["proprietary/vendor/bin/ims_rtp_daemon"], - shared_libs: ["libdiag", "libcutils", "liblog", "lib-imsvtcore", "lib-imsdpl", "lib-rtpsl", "lib-rtpcore", "lib-rtpcommon", "libqmiservices", "libqmi_csi", "libqmi_cci", "vendor.qti.imsrtpservice@3.0", "vendor.qti.imsrtpservice@3.0-service-Impl", "libutils", "libhidlbase", "libavservices_minijail", "libc++", "libc", "libm", "libdl", ], + shared_libs: ["libdiag", "libcutils", "liblog", "lib-imsvtcore", "lib-imsdpl", "lib-rtpsl", "lib-rtpcore", "lib-rtpcommon", "libqmiservices", "libqmi_csi", "libqmi_cci", "vendor.qti.imsrtpservice@3.0-vendor", "vendor.qti.imsrtpservice@3.0-service-Impl", "libutils", "libhidlbase", "libavservices_minijail", "libc++", "libc", "libm", "libdl", ], }, }, compile_multilib: "64", @@ -11482,7 +11480,7 @@ cc_prebuilt_binary { target: { android_arm64: { srcs: ["proprietary/vendor/bin/qcc-trd"], - shared_libs: ["libcutils", "liblog", "libutils", "libprotobuf-cpp-full-3.9.1-vendorcompat", "libgrpc++_unsecure", "libqcc_file_agent", "libqmi_cci", "libqmiservices", "libidl", "libnl", "libfmq", "libhidlbase", "vendor.qti.hardware.qccsyshal@1.1-vendor", "libz", "libbinder", "libbase", "vendor.qti.hardware.qccvndhal@1.0-vendor", "vendor.qti.hardware.qccvndhal@1.0-halimpl", "libc++", "libc", "libm", "libdl", ], + shared_libs: ["libcutils", "liblog", "libutils", "libprotobuf-cpp-full-3.9.1-vendorcompat", "libgrpc++_unsecure_prebuilt", "libqcc_file_agent", "libqmi_cci", "libqmiservices", "libidl", "libnl", "libfmq", "libhidlbase", "vendor.qti.hardware.qccsyshal@1.1-vendor", "libz", "libbinder", "libbase", "vendor.qti.hardware.qccvndhal@1.0-vendor", "vendor.qti.hardware.qccvndhal@1.0-halimpl", "libc++", "libc", "libm", "libdl", ], }, }, compile_multilib: "64", diff --git a/sm8450-common-vendor.mk b/sm8450-common-vendor.mk index e12fdba..b593e27 100644 --- a/sm8450-common-vendor.mk +++ b/sm8450-common-vendor.mk @@ -780,7 +780,7 @@ PRODUCT_PACKAGES += \ vendor.qti.ims.rcsuce@1.1 \ vendor.qti.ims.rcsuce@1.2 \ vendor.qti.imsrtpservice@3.0-service-Impl \ - vendor.qti.imsrtpservice@3.0 \ + vendor.qti.imsrtpservice@3.0-vendor \ vendor.qti.latency@2.0 \ vendor.qti.latency@2.1 \ vendor.qti.memory.pasrmanager@1.0 \ @@ -833,7 +833,7 @@ PRODUCT_PACKAGES += \ vendor.qti.hardware.qccsyshal@1.2-halimpl \ vendor.qti.hardware.qccsyshal@1.2 \ vendor.qti.hardware.qccvndhal@1.0 \ - vendor.qti.imsrtpservice@3.0-se \ + vendor.qti.imsrtpservice@3.0 \ vendor.qti.imsrtpservice@3.1 \ vendor.qti.qccvndhal_aidl-V1-ndk \ CACertService \