From 1811a99df8eb87eb75035976044aba96a4aeae1d Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Sat, 18 Jan 2025 00:44:39 +0530 Subject: [PATCH] sm6375-common: extract-files improvements Change-Id: I517698ca3b5a93e10a5b167417631c7f8d0ab9e2 --- Android.bp | 22 +++++++++++----------- sm6375-common-vendor.mk | 6 +++--- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Android.bp b/Android.bp index 15f1966..8f27556 100644 --- a/Android.bp +++ b/Android.bp @@ -2680,7 +2680,7 @@ cc_prebuilt_library_shared { } cc_prebuilt_library_shared { - name: "com.qualcomm.qti.dpm.api@1.0-vendor", + name: "com.qualcomm.qti.dpm.api@1.0_vendor", stem: "com.qualcomm.qti.dpm.api@1.0", owner: "motorola", strip: { @@ -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-vendor", "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", @@ -3124,7 +3124,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", "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", @@ -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-vendor", "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", @@ -3686,7 +3686,7 @@ cc_prebuilt_library_shared { target: { android_arm64: { srcs: ["proprietary/vendor/lib64/libdpmqmihal.so"], - shared_libs: ["libhidlbase", "liblog", "libcutils", "libbase", "libutils", "libhardware_legacy", "libhardware", "com.qualcomm.qti.dpm.api@1.0-vendor", "libc++", "libc", "libm", "libdl", ], + shared_libs: ["libhidlbase", "liblog", "libcutils", "libbase", "libutils", "libhardware_legacy", "libhardware", "com.qualcomm.qti.dpm.api@1.0_vendor", "libc++", "libc", "libm", "libdl", ], }, }, compile_multilib: "64", @@ -6096,7 +6096,7 @@ cc_prebuilt_library_shared { } cc_prebuilt_library_shared { - name: "vendor.qti.hardware.fm@1.0-vendor", + name: "vendor.qti.hardware.fm@1.0_vendor", stem: "vendor.qti.hardware.fm@1.0", owner: "motorola", strip: { @@ -7142,7 +7142,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-vendor", "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", @@ -7151,7 +7151,7 @@ cc_prebuilt_library_shared { } cc_prebuilt_library_shared { - name: "vendor.qti.imsrtpservice@3.0-vendor", + name: "vendor.qti.imsrtpservice@3.0_vendor", stem: "vendor.qti.imsrtpservice@3.0", owner: "motorola", strip: { @@ -8784,7 +8784,7 @@ cc_prebuilt_binary { target: { android_arm64: { srcs: ["proprietary/vendor/bin/dpmQmiMgr"], - shared_libs: ["libcutils", "liblog", "libbase", "libutils", "libhardware_legacy", "libhardware", "libhidlbase", "libqmi_cci", "libqmi_client_helper", "libqmiservices", "libdpmqmihal", "com.qualcomm.qti.dpm.api@1.0-vendor", "libc++", "libc", "libm", "libdl", ], + shared_libs: ["libcutils", "liblog", "libbase", "libutils", "libhardware_legacy", "libhardware", "libhidlbase", "libqmi_cci", "libqmi_client_helper", "libqmiservices", "libdpmqmihal", "com.qualcomm.qti.dpm.api@1.0_vendor", "libc++", "libc", "libm", "libdl", ], }, }, compile_multilib: "64", @@ -8835,7 +8835,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-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", ], + 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", @@ -9069,7 +9069,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", "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", diff --git a/sm6375-common-vendor.mk b/sm6375-common-vendor.mk index cc0a730..9330421 100644 --- a/sm6375-common-vendor.mk +++ b/sm6375-common-vendor.mk @@ -452,7 +452,7 @@ PRODUCT_PACKAGES += \ libspeakerbundle \ vendor.qti.hardware.wifidisplaysession@1.0 \ vendor.qti.hardware.wifidisplaysessionl@1.0-halimpl \ - com.qualcomm.qti.dpm.api@1.0-vendor \ + com.qualcomm.qti.dpm.api@1.0_vendor \ com.qualcomm.qti.imscmservice@1.0 \ com.qualcomm.qti.imscmservice@2.0 \ com.qualcomm.qti.imscmservice@2.1 \ @@ -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 \ + 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 \ @@ -714,7 +714,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 \ + vendor.qti.imsrtpservice@3.0_vendor \ vendor.qti.latency@2.0 \ vendor.qti.latency@2.1 \ bm2n06 \