From 2e3abf28a055b9200941379bee3f9fd4e18927da Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Tue, 10 Sep 2024 01:42:47 +0300 Subject: [PATCH] sm7325-common: extract-files improvements Change-Id: Ib821e6c185b7e7dbe462ec230039313f88ada814 --- Android.bp | 22 +++++++++++----------- sm7325-common-vendor.mk | 6 +++--- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Android.bp b/Android.bp index b8faf9e..5ff54f3 100644 --- a/Android.bp +++ b/Android.bp @@ -3228,7 +3228,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: { @@ -3515,7 +3515,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", @@ -3690,7 +3690,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", @@ -4098,7 +4098,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", @@ -4354,7 +4354,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", @@ -6917,7 +6917,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: { @@ -8065,7 +8065,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", @@ -8074,7 +8074,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: { @@ -9945,7 +9945,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", @@ -10014,7 +10014,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", @@ -10356,7 +10356,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/sm7325-common-vendor.mk b/sm7325-common-vendor.mk index 43050ab..ecfd1d6 100644 --- a/sm7325-common-vendor.mk +++ b/sm7325-common-vendor.mk @@ -483,7 +483,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 \ @@ -699,7 +699,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.iop@1.0 \ vendor.qti.hardware.iop@2.0 \ vendor.qti.hardware.mwqemadapter@1.0 \ @@ -767,7 +767,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 \ vendor.qti.qspmhal@1.0-impl \