From 5987985c45a1e3b7162fbf9dd77ff5ac3fae1f5c Mon Sep 17 00:00:00 2001 From: Cosmin Tanislav Date: Sat, 17 Aug 2024 02:04:34 +0300 Subject: [PATCH] sm8450-common: Fix vendor.qti.diaghal@1.0 ELF checks Change-Id: Idf2919284e9843e4f7d2c1b903bbffd04ded0863 --- Android.bp | 9 ++++----- sm8450-common-vendor.mk | 4 ++-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Android.bp b/Android.bp index dcc3ace..c607374 100644 --- a/Android.bp +++ b/Android.bp @@ -7045,7 +7045,8 @@ cc_prebuilt_library_shared { } cc_prebuilt_library_shared { - name: "vendor.qti.diaghal@1.0", + name: "vendor.qti.diaghal@1.0-vendor", + stem: "vendor.qti.diaghal@1.0", owner: "xiaomi", strip: { none: true, @@ -9238,7 +9239,6 @@ cc_prebuilt_library_shared { }, }, compile_multilib: "64", - check_elf_files: false, prefer: true, system_ext_specific: true, } @@ -9707,8 +9707,7 @@ cc_prebuilt_library_shared { } cc_prebuilt_library_shared { - name: "vendor.qti.diaghal@1.0-se", - stem: "vendor.qti.diaghal@1.0", + name: "vendor.qti.diaghal@1.0", owner: "xiaomi", strip: { none: true, @@ -10536,7 +10535,7 @@ cc_prebuilt_binary { target: { android_arm64: { srcs: ["proprietary/vendor/bin/diag-router"], - shared_libs: ["libhidlbase", "libutils", "libqsocket", "libqrtr", "liblog", "vendor.qti.diaghal@1.0", "libhidlmemory", "android.hidl.allocator@1.0", "android.hidl.memory@1.0", "libc++", "libc", "libm", "libdl", ], + shared_libs: ["libhidlbase", "libutils", "libqsocket", "libqrtr", "liblog", "vendor.qti.diaghal@1.0-vendor", "libhidlmemory", "android.hidl.allocator@1.0", "android.hidl.memory@1.0", "libc++", "libc", "libm", "libdl", ], }, }, compile_multilib: "64", diff --git a/sm8450-common-vendor.mk b/sm8450-common-vendor.mk index b593e27..38ea5d8 100644 --- a/sm8450-common-vendor.mk +++ b/sm8450-common-vendor.mk @@ -668,7 +668,7 @@ PRODUCT_PACKAGES += \ vendor.qti.data.factory@2.5 \ vendor.qti.data.mwqem@1.0 \ vendor.qti.data.slm@1.0 \ - vendor.qti.diaghal@1.0 \ + vendor.qti.diaghal@1.0-vendor \ vendor.qti.esepowermanager@1.0 \ vendor.qti.esepowermanager@1.1 \ vendor.qti.gnss-V3-ndk \ @@ -824,7 +824,7 @@ PRODUCT_PACKAGES += \ libwfduibcsrc \ libwfduibcsrcinterface \ vendor.qti.ImsRtpService-V1-ndk \ - vendor.qti.diaghal@1.0-se \ + vendor.qti.diaghal@1.0 \ vendor.qti.hardware.dpmaidlservice-V1-ndk \ vendor.qti.hardware.dpmservice@1.0 \ vendor.qti.hardware.dpmservice@1.1 \