From c7a64827fc72472fdebbc30dc146a7a0214a83d8 Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Sat, 18 Jan 2025 00:21:04 +0530 Subject: [PATCH] sm6375-common: fix vendor.qti.hardware.fm@1.0 ELF checks Change-Id: I43f0824f88c24dd9d039f9075090c17f4266ab2d --- Android.bp | 9 +++++---- sm6375-common-vendor.mk | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Android.bp b/Android.bp index 4e69fa3..d6cf752 100644 --- a/Android.bp +++ b/Android.bp @@ -2985,7 +2985,7 @@ cc_prebuilt_library_shared { target: { android_arm64: { srcs: ["proprietary/vendor/lib64/hw/vendor.qti.hardware.fm@1.0-impl.so"], - shared_libs: ["libbase", "libcutils", "libhidlbase", "liblog", "libutils", "vendor.qti.hardware.fm@1.0", "android.hardware.bluetooth@1.0-impl-qti", "libqmi", "libqmiservices", "libqmi_cci", "libc++", "libc", "libm", "libdl", ], + shared_libs: ["libbase", "libcutils", "libhidlbase", "liblog", "libutils", "vendor.qti.hardware.fm@1.0-vendor", "android.hardware.bluetooth@1.0-impl-qti", "libqmi", "libqmiservices", "libqmi_cci", "libc++", "libc", "libm", "libdl", ], }, }, compile_multilib: "64", @@ -3430,7 +3430,7 @@ cc_prebuilt_library_shared { target: { android_arm64: { srcs: ["proprietary/vendor/lib64/libbt-hidlclient.so"], - shared_libs: ["libutils", "libhidlbase", "android.hardware.bluetooth@1.0", "com.dsi.ant@1.0", "vendor.qti.hardware.fm@1.0", "liblog", "libc++", "libc", "libm", "libdl", ], + shared_libs: ["libutils", "libhidlbase", "android.hardware.bluetooth@1.0", "com.dsi.ant@1.0", "vendor.qti.hardware.fm@1.0-vendor", "liblog", "libc++", "libc", "libm", "libdl", ], }, }, compile_multilib: "64", @@ -6091,7 +6091,8 @@ cc_prebuilt_library_shared { } cc_prebuilt_library_shared { - name: "vendor.qti.hardware.fm@1.0", + name: "vendor.qti.hardware.fm@1.0-vendor", + stem: "vendor.qti.hardware.fm@1.0", owner: "motorola", strip: { none: true, @@ -8828,7 +8829,7 @@ cc_prebuilt_binary { target: { android_arm64: { srcs: ["proprietary/vendor/bin/hw/android.hardware.bluetooth@1.0-service-qti"], - shared_libs: ["liblog", "libcutils", "libutils", "libhidlbase", "android.hardware.bluetooth@1.0", "libsoc_helper", "vendor.qti.hardware.fm@1.0", "com.dsi.ant@1.0", "vendor.qti.hardware.bluetooth_sar@1.0", "vendor.qti.hardware.bluetooth_sar@1.1", "vendor.qti.hardware.btconfigstore@1.0", "vendor.qti.hardware.btconfigstore@2.0", "libqti_vndfwk_detect", "libc++", "libc", "libm", "libdl", ], + shared_libs: ["liblog", "libcutils", "libutils", "libhidlbase", "android.hardware.bluetooth@1.0", "libsoc_helper", "vendor.qti.hardware.fm@1.0-vendor", "com.dsi.ant@1.0", "vendor.qti.hardware.bluetooth_sar@1.0", "vendor.qti.hardware.bluetooth_sar@1.1", "vendor.qti.hardware.btconfigstore@1.0", "vendor.qti.hardware.btconfigstore@2.0", "libqti_vndfwk_detect", "libc++", "libc", "libm", "libdl", ], }, }, compile_multilib: "64", diff --git a/sm6375-common-vendor.mk b/sm6375-common-vendor.mk index 899385e..e938900 100644 --- a/sm6375-common-vendor.mk +++ b/sm6375-common-vendor.mk @@ -652,7 +652,7 @@ PRODUCT_PACKAGES += \ vendor.qti.hardware.data.lce@1.0 \ vendor.qti.hardware.data.qmi@1.0 \ vendor.qti.hardware.eid@1.0 \ - vendor.qti.hardware.fm@1.0 \ + vendor.qti.hardware.fm@1.0-vendor \ vendor.qti.hardware.mwqemadapter@1.0 \ vendor.qti.hardware.qteeconnector@1.0 \ vendor.qti.hardware.radio.am@1.0 \