diff --git a/Android.bp b/Android.bp index 48eb278..a491825 100644 --- a/Android.bp +++ b/Android.bp @@ -1756,49 +1756,6 @@ cc_prebuilt_library_shared { soc_specific: true, } -cc_prebuilt_library_shared { - name: "libcvpcpuRev_skel", - owner: "motorola", - strip: { - none: true, - }, - target: { - android_arm: { - srcs: [ - "proprietary/vendor/lib/libcvpcpuRev_skel.so", - ], - shared_libs: [ - "liblog", - "libc++", - "libcdsprpc", - "libion", - "libcvp_common", - "libc", - "libm", - "libdl", - ], - }, - android_arm64: { - srcs: [ - "proprietary/vendor/lib64/libcvpcpuRev_skel.so", - ], - shared_libs: [ - "liblog", - "libc++", - "libcdsprpc", - "libion", - "libcvp_common", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "both", - prefer: true, - soc_specific: true, -} - cc_prebuilt_library_shared { name: "libdiag", owner: "motorola", @@ -4019,49 +3976,6 @@ cc_prebuilt_library_shared { soc_specific: true, } -cc_prebuilt_library_shared { - name: "vendor.qti.hardware.cvp@1.0", - owner: "motorola", - strip: { - none: true, - }, - target: { - android_arm: { - srcs: [ - "proprietary/vendor/lib/vendor.qti.hardware.cvp@1.0.so", - ], - shared_libs: [ - "libhidlbase", - "liblog", - "libutils", - "libcutils", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - android_arm64: { - srcs: [ - "proprietary/vendor/lib64/vendor.qti.hardware.cvp@1.0.so", - ], - shared_libs: [ - "libhidlbase", - "liblog", - "libutils", - "libcutils", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "both", - prefer: true, - soc_specific: true, -} - cc_prebuilt_library_shared { name: "vendor.qti.hardware.dsp@1.0", owner: "motorola", @@ -7216,6 +7130,34 @@ cc_prebuilt_library_shared { soc_specific: true, } +cc_prebuilt_library_shared { + name: "libcvpcpuRev_skel", + owner: "motorola", + strip: { + none: true, + }, + target: { + android_arm64: { + srcs: [ + "proprietary/vendor/lib64/libcvpcpuRev_skel.so", + ], + shared_libs: [ + "liblog", + "libc++", + "libcdsprpc", + "libion", + "libcvp_common", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "64", + prefer: true, + soc_specific: true, +} + cc_prebuilt_library_shared { name: "libdataitems", owner: "motorola", @@ -11172,6 +11114,34 @@ cc_prebuilt_library_shared { soc_specific: true, } +cc_prebuilt_library_shared { + name: "vendor.qti.hardware.cvp@1.0", + owner: "motorola", + strip: { + none: true, + }, + target: { + android_arm64: { + srcs: [ + "proprietary/vendor/lib64/vendor.qti.hardware.cvp@1.0.so", + ], + shared_libs: [ + "libhidlbase", + "liblog", + "libutils", + "libcutils", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "64", + prefer: true, + soc_specific: true, +} + cc_prebuilt_library_shared { name: "vendor.qti.hardware.data.cne.internal.api@1.0", owner: "motorola", diff --git a/proprietary/vendor/lib/libcvpcpuRev_skel.so b/proprietary/vendor/lib/libcvpcpuRev_skel.so deleted file mode 100644 index ab0f0fd..0000000 Binary files a/proprietary/vendor/lib/libcvpcpuRev_skel.so and /dev/null differ diff --git a/proprietary/vendor/lib/vendor.qti.hardware.cvp@1.0.so b/proprietary/vendor/lib/vendor.qti.hardware.cvp@1.0.so deleted file mode 100644 index 905e329..0000000 Binary files a/proprietary/vendor/lib/vendor.qti.hardware.cvp@1.0.so and /dev/null differ diff --git a/sm6375-common-vendor.mk b/sm6375-common-vendor.mk index 3f9a368..51d96b2 100644 --- a/sm6375-common-vendor.mk +++ b/sm6375-common-vendor.mk @@ -356,7 +356,6 @@ PRODUCT_PACKAGES += \ libcdsprpc \ libconfigdb \ libcvp_common \ - libcvpcpuRev_skel \ libdiag \ libdsi_netctrl \ libdsutils \ @@ -410,7 +409,6 @@ PRODUCT_PACKAGES += \ vendor.qti.diaghal@1.0_vendor \ vendor.qti.hardware.bluetooth_sar@1.0 \ vendor.qti.hardware.bluetooth_sar@1.1 \ - vendor.qti.hardware.cvp@1.0 \ vendor.qti.hardware.dsp@1.0 \ vendor.qti.hardware.qccsyshal@1.0_vendor \ vendor.qti.hardware.scve.objecttracker@1.0 \ @@ -508,6 +506,7 @@ PRODUCT_PACKAGES += \ libcneoplookup \ libcneqmiutils \ libcpion \ + libcvpcpuRev_skel \ libdataitems \ libdisp-aba \ libdisplayqos \ @@ -639,6 +638,7 @@ PRODUCT_PACKAGES += \ vendor.qti.gnss@4.0 \ vendor.qti.hardware.alarm@1.0 \ vendor.qti.hardware.cacert@1.0 \ + vendor.qti.hardware.cvp@1.0 \ vendor.qti.hardware.data.cne.internal.api@1.0 \ vendor.qti.hardware.data.cne.internal.constants@1.0 \ vendor.qti.hardware.data.cne.internal.server@1.0 \