sm7325-common: Fix a few more ELF checks

Change-Id: I0bae83ab140651aa19807284a481975aa822d392
This commit is contained in:
Marc Bourgoin 2024-11-10 20:59:30 -07:00
parent 709af15392
commit 21d8023481
2 changed files with 54 additions and 46 deletions

View File

@ -1491,7 +1491,7 @@ cc_prebuilt_library_shared {
"libhidlbase", "libhidlbase",
"libhidlmemory", "libhidlmemory",
"android.hidl.memory@1.0", "android.hidl.memory@1.0",
"vendor.qti.qspmhal@1.0", "vendor.qti.qspmhal@1.0_vendor",
"libdl", "libdl",
"libz", "libz",
"liblog", "liblog",
@ -1511,7 +1511,7 @@ cc_prebuilt_library_shared {
"libhidlbase", "libhidlbase",
"libhidlmemory", "libhidlmemory",
"android.hidl.memory@1.0", "android.hidl.memory@1.0",
"vendor.qti.qspmhal@1.0", "vendor.qti.qspmhal@1.0_vendor",
"libdl", "libdl",
"libz", "libz",
"liblog", "liblog",
@ -3025,7 +3025,8 @@ cc_prebuilt_library_shared {
} }
cc_prebuilt_library_shared { cc_prebuilt_library_shared {
name: "libmmosal", name: "libmmosal_vendor",
stem: "libmmosal",
owner: "motorola", owner: "motorola",
strip: { strip: {
none: true, none: true,
@ -4902,7 +4903,8 @@ cc_prebuilt_library_shared {
} }
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: "motorola", owner: "motorola",
strip: { strip: {
none: true, none: true,
@ -5340,7 +5342,8 @@ cc_prebuilt_library_shared {
} }
cc_prebuilt_library_shared { cc_prebuilt_library_shared {
name: "vendor.qti.hardware.wifidisplaysession@1.0", name: "vendor.qti.hardware.wifidisplaysession@1.0_vendor",
stem: "vendor.qti.hardware.wifidisplaysession@1.0",
owner: "motorola", owner: "motorola",
strip: { strip: {
none: true, none: true,
@ -5471,7 +5474,8 @@ cc_prebuilt_library_shared {
} }
cc_prebuilt_library_shared { cc_prebuilt_library_shared {
name: "vendor.qti.qspmhal@1.0", name: "vendor.qti.qspmhal@1.0_vendor",
stem: "vendor.qti.qspmhal@1.0",
owner: "motorola", owner: "motorola",
strip: { strip: {
none: true, none: true,
@ -5549,7 +5553,7 @@ cc_prebuilt_library_shared {
"proprietary/vendor/lib/libFileMux_proprietary.so", "proprietary/vendor/lib/libFileMux_proprietary.so",
], ],
shared_libs: [ shared_libs: [
"libmmosal", "libmmosal_vendor",
"liblog", "liblog",
"libutils", "libutils",
"libcutils", "libcutils",
@ -5605,9 +5609,8 @@ cc_prebuilt_library_shared {
], ],
shared_libs: [ shared_libs: [
"liblog", "liblog",
"libmmosal", "libmmosal_vendor",
"libutils", "libutils",
"libOmxCore",
"libwfdcommonutils_proprietary", "libwfdcommonutils_proprietary",
"libwfdmmservice_proprietary", "libwfdmmservice_proprietary",
"libbinder", "libbinder",
@ -5620,6 +5623,7 @@ cc_prebuilt_library_shared {
}, },
}, },
compile_multilib: "32", compile_multilib: "32",
check_elf_files: false,
prefer: true, prefer: true,
soc_specific: true, soc_specific: true,
} }
@ -5718,7 +5722,7 @@ cc_prebuilt_library_shared {
"libutils", "libutils",
"liblog", "liblog",
"libcutils", "libcutils",
"libmmosal", "libmmosal_vendor",
"libc++", "libc++",
"libc", "libc",
"libm", "libm",
@ -5743,7 +5747,7 @@ cc_prebuilt_library_shared {
"proprietary/vendor/lib/libmmrtpencoder_proprietary.so", "proprietary/vendor/lib/libmmrtpencoder_proprietary.so",
], ],
shared_libs: [ shared_libs: [
"libmmosal", "libmmosal_vendor",
"liblog", "liblog",
"libutils", "libutils",
"libcutils", "libcutils",
@ -6057,7 +6061,7 @@ cc_prebuilt_library_shared {
"proprietary/vendor/lib/libwfdcodecv4l2_proprietary.so", "proprietary/vendor/lib/libwfdcodecv4l2_proprietary.so",
], ],
shared_libs: [ shared_libs: [
"libmmosal", "libmmosal_vendor",
"liblog", "liblog",
"libutils", "libutils",
"libcutils", "libcutils",
@ -6088,7 +6092,7 @@ cc_prebuilt_library_shared {
"proprietary/vendor/lib/libwfdcommonutils_proprietary.so", "proprietary/vendor/lib/libwfdcommonutils_proprietary.so",
], ],
shared_libs: [ shared_libs: [
"libmmosal", "libmmosal_vendor",
"liblog", "liblog",
"libutils", "libutils",
"libcutils", "libcutils",
@ -6119,7 +6123,7 @@ cc_prebuilt_library_shared {
"proprietary/vendor/lib/libwfdconfigutils_proprietary.so", "proprietary/vendor/lib/libwfdconfigutils_proprietary.so",
], ],
shared_libs: [ shared_libs: [
"libmmosal", "libmmosal_vendor",
"liblog", "liblog",
"libutils", "libutils",
"libcutils", "libcutils",
@ -6180,7 +6184,7 @@ cc_prebuilt_library_shared {
"proprietary/vendor/lib/libwfdhdcpcp.so", "proprietary/vendor/lib/libwfdhdcpcp.so",
], ],
shared_libs: [ shared_libs: [
"libmmosal", "libmmosal_vendor",
"libDxHdcp", "libDxHdcp",
"libmm-hdcpmgr", "libmm-hdcpmgr",
"liblog", "liblog",
@ -6210,7 +6214,7 @@ cc_prebuilt_library_shared {
"proprietary/vendor/lib/libwfdhdcpservice_proprietary.so", "proprietary/vendor/lib/libwfdhdcpservice_proprietary.so",
], ],
shared_libs: [ shared_libs: [
"libmmosal", "libmmosal_vendor",
"liblog", "liblog",
"libutils", "libutils",
"libcutils", "libcutils",
@ -6241,7 +6245,7 @@ cc_prebuilt_library_shared {
"proprietary/vendor/lib/libwfdmminterface_proprietary.so", "proprietary/vendor/lib/libwfdmminterface_proprietary.so",
], ],
shared_libs: [ shared_libs: [
"libmmosal", "libmmosal_vendor",
"liblog", "liblog",
"libutils", "libutils",
"libc++", "libc++",
@ -6268,7 +6272,7 @@ cc_prebuilt_library_shared {
"proprietary/vendor/lib/libwfdmmservice_proprietary.so", "proprietary/vendor/lib/libwfdmmservice_proprietary.so",
], ],
shared_libs: [ shared_libs: [
"libmmosal", "libmmosal_vendor",
"liblog", "liblog",
"libutils", "libutils",
"libcutils", "libcutils",
@ -6298,7 +6302,7 @@ cc_prebuilt_library_shared {
], ],
shared_libs: [ shared_libs: [
"libbinder", "libbinder",
"libmmosal", "libmmosal_vendor",
"liblog", "liblog",
"libutils", "libutils",
"libmmrtpencoder_proprietary", "libmmrtpencoder_proprietary",
@ -6339,7 +6343,7 @@ cc_prebuilt_library_shared {
"proprietary/vendor/lib/libwfdmodulehdcpsession.so", "proprietary/vendor/lib/libwfdmodulehdcpsession.so",
], ],
shared_libs: [ shared_libs: [
"libmmosal", "libmmosal_vendor",
"liblog", "liblog",
"libutils", "libutils",
"libwfdhdcpcp", "libwfdhdcpcp",
@ -6373,7 +6377,7 @@ cc_prebuilt_library_shared {
"libc++", "libc++",
"libcutils", "libcutils",
"libutils", "libutils",
"libmmosal", "libmmosal_vendor",
"libwfdcommonutils_proprietary", "libwfdcommonutils_proprietary",
"libwfdconfigutils_proprietary", "libwfdconfigutils_proprietary",
"liblog", "liblog",
@ -6400,11 +6404,11 @@ cc_prebuilt_library_shared {
"proprietary/vendor/lib/libwfdsessionmodule.so", "proprietary/vendor/lib/libwfdsessionmodule.so",
], ],
shared_libs: [ shared_libs: [
"libmmosal", "libmmosal_vendor",
"liblog", "liblog",
"libutils", "libutils",
"libwfdsourcesession_proprietary", "libwfdsourcesession_proprietary",
"vendor.qti.hardware.wifidisplaysession@1.0", "vendor.qti.hardware.wifidisplaysession@1.0_vendor",
"libwfdcommonutils_proprietary", "libwfdcommonutils_proprietary",
"libhidlbase", "libhidlbase",
"libc++", "libc++",
@ -6435,7 +6439,7 @@ cc_prebuilt_library_shared {
"libutils", "libutils",
"libcutils", "libcutils",
"libbinder", "libbinder",
"libmmosal", "libmmosal_vendor",
"libwfdcommonutils_proprietary", "libwfdcommonutils_proprietary",
"libwfdconfigutils_proprietary", "libwfdconfigutils_proprietary",
"libwfdmminterface_proprietary", "libwfdmminterface_proprietary",
@ -6476,7 +6480,7 @@ cc_prebuilt_library_shared {
"libmmrtpdecoder_proprietary", "libmmrtpdecoder_proprietary",
"libwfduibcinterface_proprietary", "libwfduibcinterface_proprietary",
"libwfdmmsrc_proprietary", "libwfdmmsrc_proprietary",
"libmmosal", "libmmosal_vendor",
"libwfdcommonutils_proprietary", "libwfdcommonutils_proprietary",
"libwfdconfigutils_proprietary", "libwfdconfigutils_proprietary",
"libqdMetaData", "libqdMetaData",
@ -6508,7 +6512,7 @@ cc_prebuilt_library_shared {
"proprietary/vendor/lib/libwfduibcinterface_proprietary.so", "proprietary/vendor/lib/libwfduibcinterface_proprietary.so",
], ],
shared_libs: [ shared_libs: [
"libmmosal", "libmmosal_vendor",
"liblog", "liblog",
"libutils", "libutils",
"libcutils", "libcutils",
@ -6538,7 +6542,7 @@ cc_prebuilt_library_shared {
"proprietary/vendor/lib/libwfduibcsink_proprietary.so", "proprietary/vendor/lib/libwfduibcsink_proprietary.so",
], ],
shared_libs: [ shared_libs: [
"libmmosal", "libmmosal_vendor",
"libutils", "libutils",
"liblog", "liblog",
"libc++", "libc++",
@ -6565,7 +6569,7 @@ cc_prebuilt_library_shared {
"proprietary/vendor/lib/libwfduibcsinkinterface_proprietary.so", "proprietary/vendor/lib/libwfduibcsinkinterface_proprietary.so",
], ],
shared_libs: [ shared_libs: [
"libmmosal", "libmmosal_vendor",
"liblog", "liblog",
"libutils", "libutils",
"libcutils", "libcutils",
@ -6596,7 +6600,7 @@ cc_prebuilt_library_shared {
"proprietary/vendor/lib/libwfduibcsrc_proprietary.so", "proprietary/vendor/lib/libwfduibcsrc_proprietary.so",
], ],
shared_libs: [ shared_libs: [
"libmmosal", "libmmosal_vendor",
"libwfdcommonutils_proprietary", "libwfdcommonutils_proprietary",
"liblog", "liblog",
"libutils", "libutils",
@ -6627,7 +6631,7 @@ cc_prebuilt_library_shared {
"proprietary/vendor/lib/libwfduibcsrcinterface_proprietary.so", "proprietary/vendor/lib/libwfduibcsrcinterface_proprietary.so",
], ],
shared_libs: [ shared_libs: [
"libmmosal", "libmmosal_vendor",
"liblog", "liblog",
"libutils", "libutils",
"libcutils", "libcutils",
@ -6658,7 +6662,7 @@ cc_prebuilt_library_shared {
"proprietary/vendor/lib/libwfdutils_proprietary.so", "proprietary/vendor/lib/libwfdutils_proprietary.so",
], ],
shared_libs: [ shared_libs: [
"libmmosal", "libmmosal_vendor",
"liblog", "liblog",
"libion", "libion",
"libc++", "libc++",
@ -6749,7 +6753,7 @@ cc_prebuilt_library_shared {
"libhidlbase", "libhidlbase",
"libutils", "libutils",
"libcutils", "libcutils",
"vendor.qti.hardware.wifidisplaysession@1.0", "vendor.qti.hardware.wifidisplaysession@1.0_vendor",
"libwfdsessionmodule", "libwfdsessionmodule",
"liblog", "liblog",
"libwfdcommonutils_proprietary", "libwfdcommonutils_proprietary",
@ -8899,7 +8903,7 @@ cc_prebuilt_library_shared {
"libutils", "libutils",
"android.hardware.thermal@2.0", "android.hardware.thermal@2.0",
"android.hidl.allocator@1.0", "android.hidl.allocator@1.0",
"vendor.qti.qspmhal@1.0", "vendor.qti.qspmhal@1.0_vendor",
"android.hidl.memory@1.0", "android.hidl.memory@1.0",
"libhidlmemory", "libhidlmemory",
"libc++", "libc++",
@ -8910,6 +8914,7 @@ cc_prebuilt_library_shared {
}, },
}, },
compile_multilib: "64", compile_multilib: "64",
check_elf_files: false,
prefer: true, prefer: true,
soc_specific: true, soc_specific: true,
} }
@ -10171,7 +10176,7 @@ cc_prebuilt_library_shared {
"libbase", "libbase",
"libfmq", "libfmq",
"libhidlbase", "libhidlbase",
"vendor.qti.hardware.qccsyshal@1.0", "vendor.qti.hardware.qccsyshal@1.0_vendor",
"libc++", "libc++",
"libc", "libc",
"libm", "libm",
@ -13374,7 +13379,8 @@ cc_prebuilt_library_shared {
} }
cc_prebuilt_library_shared { cc_prebuilt_library_shared {
name: "vendor.qti.hardware.qccsyshal@1.0", name: "vendor.qti.hardware.qccsyshal@1.0_vendor",
stem: "vendor.qti.hardware.qccsyshal@1.0",
owner: "motorola", owner: "motorola",
strip: { strip: {
none: true, none: true,
@ -13402,7 +13408,8 @@ cc_prebuilt_library_shared {
} }
cc_prebuilt_library_shared { cc_prebuilt_library_shared {
name: "vendor.qti.hardware.qccvndhal@1.0", name: "vendor.qti.hardware.qccvndhal@1.0_vendor",
stem: "vendor.qti.hardware.qccvndhal@1.0",
owner: "motorola", owner: "motorola",
strip: { strip: {
none: true, none: true,
@ -15418,7 +15425,7 @@ cc_prebuilt_library_shared {
], ],
shared_libs: [ shared_libs: [
"libutils", "libutils",
"vendor.qti.qspmhal@1.0", "vendor.qti.qspmhal@1.0_vendor",
"android.hidl.allocator@1.0", "android.hidl.allocator@1.0",
"android.hidl.memory@1.0", "android.hidl.memory@1.0",
"libhidlbase", "libhidlbase",
@ -18446,7 +18453,7 @@ cc_prebuilt_binary {
"libqsocket", "libqsocket",
"libqrtr", "libqrtr",
"liblog", "liblog",
"vendor.qti.diaghal@1.0", "vendor.qti.diaghal@1.0_vendor",
"libhidlmemory", "libhidlmemory",
"android.hidl.allocator@1.0", "android.hidl.allocator@1.0",
"android.hidl.memory@1.0", "android.hidl.memory@1.0",
@ -20278,6 +20285,7 @@ cc_prebuilt_binary {
}, },
}, },
compile_multilib: "64", compile_multilib: "64",
check_elf_files: false,
strip: { strip: {
none: true, none: true,
}, },
@ -20352,7 +20360,7 @@ cc_prebuilt_binary {
"proprietary/vendor/bin/vendor.qti.qspmhal@1.0-service", "proprietary/vendor/bin/vendor.qti.qspmhal@1.0-service",
], ],
shared_libs: [ shared_libs: [
"vendor.qti.qspmhal@1.0", "vendor.qti.qspmhal@1.0_vendor",
"vendor.qti.qspmhal@1.0-impl", "vendor.qti.qspmhal@1.0-impl",
"libhidlbase", "libhidlbase",
"liblog", "liblog",
@ -20488,7 +20496,7 @@ cc_prebuilt_binary {
"proprietary/vendor/bin/wifidisplayhalservice", "proprietary/vendor/bin/wifidisplayhalservice",
], ],
shared_libs: [ shared_libs: [
"vendor.qti.hardware.wifidisplaysession@1.0", "vendor.qti.hardware.wifidisplaysession@1.0_vendor",
"vendor.qti.hardware.wifidisplaysessionl@1.0-halimpl", "vendor.qti.hardware.wifidisplaysessionl@1.0-halimpl",
"libhidlbase", "libhidlbase",
"libutils", "libutils",

View File

@ -391,7 +391,7 @@ PRODUCT_PACKAGES += \
libllvm-qcom \ libllvm-qcom \
libmdmdetect \ libmdmdetect \
libmdsprpc \ libmdsprpc \
libmmosal \ libmmosal_vendor \
libmulawdec \ libmulawdec \
libnetmgr \ libnetmgr \
libperfconfig \ libperfconfig \
@ -434,7 +434,7 @@ PRODUCT_PACKAGES += \
libqcreverb \ libqcreverb \
libqcvirt \ libqcvirt \
libshoebox \ libshoebox \
vendor.qti.diaghal@1.0 \ vendor.qti.diaghal@1.0_vendor \
vendor.qti.hardware.bluetooth_sar@1.0 \ vendor.qti.hardware.bluetooth_sar@1.0 \
vendor.qti.hardware.bluetooth_sar@1.1 \ vendor.qti.hardware.bluetooth_sar@1.1 \
vendor.qti.hardware.cvp@1.0 \ vendor.qti.hardware.cvp@1.0 \
@ -444,10 +444,10 @@ PRODUCT_PACKAGES += \
vendor.qti.hardware.vpp@1.2 \ vendor.qti.hardware.vpp@1.2 \
vendor.qti.hardware.vpp@1.3 \ vendor.qti.hardware.vpp@1.3 \
vendor.qti.hardware.vpp@2.0 \ vendor.qti.hardware.vpp@2.0 \
vendor.qti.hardware.wifidisplaysession@1.0 \ vendor.qti.hardware.wifidisplaysession@1.0_vendor \
vendor.qti.memory.pasrmanager@1.0 \ vendor.qti.memory.pasrmanager@1.0 \
vendor.qti.memory.pasrmanager@1.1 \ vendor.qti.memory.pasrmanager@1.1 \
vendor.qti.qspmhal@1.0 \ vendor.qti.qspmhal@1.0_vendor \
libDxHdcp \ libDxHdcp \
libFileMux_proprietary \ libFileMux_proprietary \
libOmxDsdDec \ libOmxDsdDec \
@ -703,8 +703,8 @@ PRODUCT_PACKAGES += \
vendor.qti.hardware.iop@1.0 \ vendor.qti.hardware.iop@1.0 \
vendor.qti.hardware.iop@2.0 \ vendor.qti.hardware.iop@2.0 \
vendor.qti.hardware.mwqemadapter@1.0 \ vendor.qti.hardware.mwqemadapter@1.0 \
vendor.qti.hardware.qccsyshal@1.0 \ vendor.qti.hardware.qccsyshal@1.0_vendor \
vendor.qti.hardware.qccvndhal@1.0 \ vendor.qti.hardware.qccvndhal@1.0_vendor \
vendor.qti.hardware.qseecom@1.0 \ vendor.qti.hardware.qseecom@1.0 \
vendor.qti.hardware.qteeconnector@1.0 \ vendor.qti.hardware.qteeconnector@1.0 \
vendor.qti.hardware.radio.am@1.0 \ vendor.qti.hardware.radio.am@1.0 \