From 646a094b945c375ede9dc3480d415b6d1b4100d8 Mon Sep 17 00:00:00 2001 From: Arian Date: Wed, 28 Aug 2024 16:06:10 +0200 Subject: [PATCH] sm8450-common: Fix vendor.qti.hardware.dpmservice ELF checks Change-Id: I3a8051435f47bedb566fb411ac376b866c2718a9 --- Android.bp | 20 +++++++++++--------- sm8450-common-vendor.mk | 4 ++-- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/Android.bp b/Android.bp index 35dec8d..5f22b05 100644 --- a/Android.bp +++ b/Android.bp @@ -6833,7 +6833,7 @@ cc_prebuilt_library_shared { target: { android_arm64: { srcs: ["proprietary/vendor/lib64/vendor.libdpmctmgr.so"], - shared_libs: ["libdiag", "libbinder", "libcutils", "libutils", "vendor.libdpmframework", "com.qualcomm.qti.dpm.api@1.0-vendor", "vendor.qti.hardware.dpmservice@1.0", "vendor.qti.hardware.dpmservice@1.1", "libc++", "libc", "libm", "libdl", ], + shared_libs: ["libdiag", "libbinder", "libcutils", "libutils", "vendor.libdpmframework", "com.qualcomm.qti.dpm.api@1.0-vendor", "vendor.qti.hardware.dpmservice@1.0-vendor", "vendor.qti.hardware.dpmservice@1.1-vendor", "libc++", "libc", "libm", "libdl", ], }, }, compile_multilib: "64", @@ -6850,7 +6850,7 @@ cc_prebuilt_library_shared { target: { android_arm64: { srcs: ["proprietary/vendor/lib64/vendor.libdpmfdmgr.so"], - shared_libs: ["libdiag", "libbinder", "libcutils", "libutils", "vendor.libdpmframework", "com.qualcomm.qti.dpm.api@1.0-vendor", "vendor.qti.hardware.dpmservice@1.0", "libc++", "libc", "libm", "libdl", ], + shared_libs: ["libdiag", "libbinder", "libcutils", "libutils", "vendor.libdpmframework", "com.qualcomm.qti.dpm.api@1.0-vendor", "vendor.qti.hardware.dpmservice@1.0-vendor", "libc++", "libc", "libm", "libdl", ], }, }, compile_multilib: "64", @@ -6867,7 +6867,7 @@ cc_prebuilt_library_shared { target: { android_arm64: { srcs: ["proprietary/vendor/lib64/vendor.libdpmframework.so"], - shared_libs: ["libdiag", "libbinder", "libcutils", "libutils", "liblog", "libhidlbase", "libhardware", "libhardware_legacy", "com.qualcomm.qti.dpm.api@1.0-vendor", "vendor.qti.hardware.dpmservice@1.0", "vendor.qti.hardware.dpmservice@1.1", "libc++", "libc", "libm", "libdl", ], + shared_libs: ["libdiag", "libbinder", "libcutils", "libutils", "liblog", "libhidlbase", "libhardware", "libhardware_legacy", "com.qualcomm.qti.dpm.api@1.0-vendor", "vendor.qti.hardware.dpmservice@1.0-vendor", "vendor.qti.hardware.dpmservice@1.1-vendor", "libc++", "libc", "libm", "libdl", ], }, }, compile_multilib: "64", @@ -6884,7 +6884,7 @@ cc_prebuilt_library_shared { target: { android_arm64: { srcs: ["proprietary/vendor/lib64/vendor.libdpmtcm.so"], - shared_libs: ["libdiag", "libbinder", "libcutils", "libutils", "libhidlbase", "libhardware", "libhardware_legacy", "vendor.libdpmframework", "com.qualcomm.qti.dpm.api@1.0-vendor", "vendor.qti.hardware.dpmservice@1.0", "libc++", "libc", "libm", "libdl", ], + shared_libs: ["libdiag", "libbinder", "libcutils", "libutils", "libhidlbase", "libhardware", "libhardware_legacy", "vendor.libdpmframework", "com.qualcomm.qti.dpm.api@1.0-vendor", "vendor.qti.hardware.dpmservice@1.0-vendor", "libc++", "libc", "libm", "libdl", ], }, }, compile_multilib: "64", @@ -6901,7 +6901,7 @@ cc_prebuilt_library_shared { target: { android_arm64: { srcs: ["proprietary/vendor/lib64/vendor.libmwqemiptablemgr.so"], - shared_libs: ["liblog", "libcutils", "libbase", "libutils", "vendor.libdpmframework", "libdiag", "libhidlbase", "libhardware", "libhardware_legacy", "com.qualcomm.qti.dpm.api@1.0-vendor", "vendor.qti.hardware.dpmservice@1.0", "vendor.qti.hardware.mwqemadapter@1.0", "libc++", "libc", "libm", "libdl", ], + shared_libs: ["liblog", "libcutils", "libbase", "libutils", "vendor.libdpmframework", "libdiag", "libhidlbase", "libhardware", "libhardware_legacy", "com.qualcomm.qti.dpm.api@1.0-vendor", "vendor.qti.hardware.dpmservice@1.0-vendor", "vendor.qti.hardware.mwqemadapter@1.0", "libc++", "libc", "libm", "libdl", ], }, }, compile_multilib: "64", @@ -7523,7 +7523,8 @@ cc_prebuilt_library_shared { } cc_prebuilt_library_shared { - name: "vendor.qti.hardware.dpmservice@1.0", + name: "vendor.qti.hardware.dpmservice@1.0-vendor", + stem: "vendor.qti.hardware.dpmservice@1.0", owner: "xiaomi", strip: { none: true, @@ -7540,7 +7541,8 @@ cc_prebuilt_library_shared { } cc_prebuilt_library_shared { - name: "vendor.qti.hardware.dpmservice@1.1", + name: "vendor.qti.hardware.dpmservice@1.1-vendor", + stem: "vendor.qti.hardware.dpmservice@1.1", owner: "xiaomi", strip: { none: true, @@ -7548,7 +7550,7 @@ cc_prebuilt_library_shared { target: { android_arm64: { srcs: ["proprietary/vendor/lib64/vendor.qti.hardware.dpmservice@1.1.so"], - shared_libs: ["vendor.qti.hardware.dpmservice@1.0", "libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ], + shared_libs: ["vendor.qti.hardware.dpmservice@1.0-vendor", "libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ], }, }, compile_multilib: "64", @@ -11917,7 +11919,7 @@ cc_prebuilt_binary { target: { android_arm64: { srcs: ["proprietary/vendor/bin/vendor.dpmd"], - shared_libs: ["vendor.libdpmframework", "libdiag", "libhardware_legacy", "libhidlbase", "libcutils", "libutils", "com.qualcomm.qti.dpm.api@1.0-vendor", "vendor.qti.hardware.dpmservice@1.0", "vendor.qti.hardware.dpmservice@1.1", "libc++", "libc", "libm", "libdl", ], + shared_libs: ["vendor.libdpmframework", "libdiag", "libhardware_legacy", "libhidlbase", "libcutils", "libutils", "com.qualcomm.qti.dpm.api@1.0-vendor", "vendor.qti.hardware.dpmservice@1.0-vendor", "vendor.qti.hardware.dpmservice@1.1-vendor", "libc++", "libc", "libm", "libdl", ], }, }, compile_multilib: "64", diff --git a/sm8450-common-vendor.mk b/sm8450-common-vendor.mk index b376e69..7c30113 100644 --- a/sm8450-common-vendor.mk +++ b/sm8450-common-vendor.mk @@ -696,8 +696,8 @@ PRODUCT_PACKAGES += \ vendor.qti.hardware.data.latency@1.0 \ vendor.qti.hardware.data.lce@1.0 \ vendor.qti.hardware.data.qmi@1.0 \ - vendor.qti.hardware.dpmservice@1.0 \ - vendor.qti.hardware.dpmservice@1.1 \ + vendor.qti.hardware.dpmservice@1.0-vendor \ + vendor.qti.hardware.dpmservice@1.1-vendor \ vendor.qti.hardware.dsp@1.0 \ vendor.qti.hardware.eid@1.0 \ vendor.qti.hardware.embmssl@1.0 \