diff --git a/Android.bp b/Android.bp index e53f646..280da7e 100644 --- a/Android.bp +++ b/Android.bp @@ -5942,116 +5942,6 @@ cc_prebuilt_library_shared { soc_specific: true, } -cc_prebuilt_library_shared { - name: "libqti-iopd-client", - owner: "samsung", - strip: { - none: true, - }, - target: { - android_arm: { - srcs: [ - "proprietary/vendor/lib/libqti-iopd-client.so", - ], - shared_libs: [ - "libcutils", - "libutils", - "libxml2", - "libqti-util", - "liblog", - "vendor.qti.hardware.iop@2.0", - "libhidlbase", - "libsqlite", - "libqti-perfd-client", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - android_arm64: { - srcs: [ - "proprietary/vendor/lib64/libqti-iopd-client.so", - ], - shared_libs: [ - "libcutils", - "libutils", - "libxml2", - "libqti-util", - "liblog", - "vendor.qti.hardware.iop@2.0", - "libhidlbase", - "libsqlite", - "libqti-perfd-client", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "both", - prefer: true, - soc_specific: true, -} - -cc_prebuilt_library_shared { - name: "libqti-iopd", - owner: "samsung", - strip: { - none: true, - }, - target: { - android_arm: { - srcs: [ - "proprietary/vendor/lib/libqti-iopd.so", - ], - shared_libs: [ - "libcutils", - "libutils", - "libxml2", - "libqti-util", - "liblog", - "libhidlbase", - "vendor.qti.hardware.iop@2.0", - "libbase", - "libqti-iopd-client", - "libqti-perfd-client", - "libsqlite", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - android_arm64: { - srcs: [ - "proprietary/vendor/lib64/libqti-iopd.so", - ], - shared_libs: [ - "libcutils", - "libutils", - "libxml2", - "libqti-util", - "liblog", - "libhidlbase", - "vendor.qti.hardware.iop@2.0", - "libbase", - "libqti-iopd-client", - "libqti-perfd-client", - "libsqlite", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "both", - prefer: true, - soc_specific: true, -} - cc_prebuilt_library_shared { name: "librpmb", owner: "samsung", @@ -8503,92 +8393,6 @@ cc_prebuilt_library_shared { soc_specific: true, } -cc_prebuilt_library_shared { - name: "vendor.qti.hardware.iop@1.0", - owner: "samsung", - strip: { - none: true, - }, - target: { - android_arm: { - srcs: [ - "proprietary/vendor/lib/vendor.qti.hardware.iop@1.0.so", - ], - shared_libs: [ - "libhidlbase", - "liblog", - "libutils", - "libcutils", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - android_arm64: { - srcs: [ - "proprietary/vendor/lib64/vendor.qti.hardware.iop@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.iop@2.0", - owner: "samsung", - strip: { - none: true, - }, - target: { - android_arm: { - srcs: [ - "proprietary/vendor/lib/vendor.qti.hardware.iop@2.0.so", - ], - shared_libs: [ - "libhidlbase", - "liblog", - "libutils", - "libcutils", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - android_arm64: { - srcs: [ - "proprietary/vendor/lib64/vendor.qti.hardware.iop@2.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.qccsyshal@1.0", owner: "samsung", @@ -13832,40 +13636,6 @@ cc_prebuilt_binary { soc_specific: true, } -cc_prebuilt_binary { - name: "vendor.qti.hardware.iop@2.0-service", - owner: "samsung", - target: { - android_arm64: { - srcs: [ - "proprietary/vendor/bin/hw/vendor.qti.hardware.iop@2.0-service", - ], - shared_libs: [ - "liblog", - "libcutils", - "libbase", - "libutils", - "libhardware_legacy", - "libhardware", - "libhidlbase", - "libqti-perfd-client", - "vendor.qti.hardware.iop@2.0", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - strip: { - none: true, - }, - prefer: true, - relative_install_path: "hw", - soc_specific: true, -} - cc_prebuilt_binary { name: "vendor.qti.hardware.qseecom@1.0-service", owner: "samsung", diff --git a/proprietary/vendor/bin/hw/vendor.qti.hardware.iop@2.0-service b/proprietary/vendor/bin/hw/vendor.qti.hardware.iop@2.0-service deleted file mode 100755 index ce43de2..0000000 Binary files a/proprietary/vendor/bin/hw/vendor.qti.hardware.iop@2.0-service and /dev/null differ diff --git a/proprietary/vendor/etc/init/vendor.qti.hardware.iop@2.0-service.rc b/proprietary/vendor/etc/init/vendor.qti.hardware.iop@2.0-service.rc deleted file mode 100644 index 05f9d1f..0000000 --- a/proprietary/vendor/etc/init/vendor.qti.hardware.iop@2.0-service.rc +++ /dev/null @@ -1,17 +0,0 @@ -# @file io-p.c -# @brief Defination for iop service -# -# DESCRIPTION -# --------------------------------------------------------------------------- -# Copyright (c) 2011-2017 Qualcomm Technologies, Inc. -# All Rights Reserved. -# Confidential and Proprietary - Qualcomm Technologies, Inc. -# --------------------------------------------------------------------------- - -service iop-hal-2-0 /vendor/bin/hw/vendor.qti.hardware.iop@2.0-service - interface vendor.qti.hardware.iop@2.0::IIop default - oneshot - disabled - class hal - user root - group root readproc diff --git a/proprietary/vendor/lib/libqti-iopd-client.so b/proprietary/vendor/lib/libqti-iopd-client.so deleted file mode 100644 index 94dab52..0000000 Binary files a/proprietary/vendor/lib/libqti-iopd-client.so and /dev/null differ diff --git a/proprietary/vendor/lib/libqti-iopd.so b/proprietary/vendor/lib/libqti-iopd.so deleted file mode 100644 index 73fd134..0000000 Binary files a/proprietary/vendor/lib/libqti-iopd.so and /dev/null differ diff --git a/proprietary/vendor/lib/vendor.qti.hardware.iop@1.0.so b/proprietary/vendor/lib/vendor.qti.hardware.iop@1.0.so deleted file mode 100644 index ac8da4e..0000000 Binary files a/proprietary/vendor/lib/vendor.qti.hardware.iop@1.0.so and /dev/null differ diff --git a/proprietary/vendor/lib/vendor.qti.hardware.iop@2.0.so b/proprietary/vendor/lib/vendor.qti.hardware.iop@2.0.so deleted file mode 100644 index 44c20c9..0000000 Binary files a/proprietary/vendor/lib/vendor.qti.hardware.iop@2.0.so and /dev/null differ diff --git a/proprietary/vendor/lib64/libqti-iopd-client.so b/proprietary/vendor/lib64/libqti-iopd-client.so deleted file mode 100644 index 7b0cce2..0000000 Binary files a/proprietary/vendor/lib64/libqti-iopd-client.so and /dev/null differ diff --git a/proprietary/vendor/lib64/libqti-iopd.so b/proprietary/vendor/lib64/libqti-iopd.so deleted file mode 100644 index 35439cd..0000000 Binary files a/proprietary/vendor/lib64/libqti-iopd.so and /dev/null differ diff --git a/proprietary/vendor/lib64/vendor.qti.hardware.iop@1.0.so b/proprietary/vendor/lib64/vendor.qti.hardware.iop@1.0.so deleted file mode 100644 index 13a545d..0000000 Binary files a/proprietary/vendor/lib64/vendor.qti.hardware.iop@1.0.so and /dev/null differ diff --git a/proprietary/vendor/lib64/vendor.qti.hardware.iop@2.0.so b/proprietary/vendor/lib64/vendor.qti.hardware.iop@2.0.so deleted file mode 100644 index ae60b88..0000000 Binary files a/proprietary/vendor/lib64/vendor.qti.hardware.iop@2.0.so and /dev/null differ diff --git a/sm7125-common-vendor.mk b/sm7125-common-vendor.mk index 934c066..ed4ed77 100644 --- a/sm7125-common-vendor.mk +++ b/sm7125-common-vendor.mk @@ -34,7 +34,6 @@ PRODUCT_COPY_FILES += \ vendor/samsung/sm7125-common/proprietary/vendor/etc/init/vendor.qti.cdsprpc-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.cdsprpc-service.rc \ vendor/samsung/sm7125-common/proprietary/vendor/etc/init/vendor.qti.hardware.capabilityconfigstore@1.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.hardware.capabilityconfigstore@1.0-service.rc \ vendor/samsung/sm7125-common/proprietary/vendor/etc/init/vendor.qti.hardware.dsp@1.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.hardware.dsp@1.0-service.rc \ - vendor/samsung/sm7125-common/proprietary/vendor/etc/init/vendor.qti.hardware.iop@2.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.hardware.iop@2.0-service.rc \ vendor/samsung/sm7125-common/proprietary/vendor/etc/init/vendor.qti.hardware.qseecom@1.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.hardware.qseecom@1.0-service.rc \ vendor/samsung/sm7125-common/proprietary/vendor/etc/init/vendor.qti.hardware.tui_comm@1.0-service-qti.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.hardware.tui_comm@1.0-service-qti.rc \ vendor/samsung/sm7125-common/proprietary/vendor/etc/init/vendor.qti.media.c2@1.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.media.c2@1.0-service.rc \ @@ -276,8 +275,6 @@ PRODUCT_PACKAGES += \ libqsap_sdk \ libqseed3 \ libqsocket \ - libqti-iopd-client \ - libqti-iopd \ librpmb \ libsdedrm \ libsdm-color \ @@ -332,8 +329,6 @@ PRODUCT_PACKAGES += \ vendor.qti.hardware.cvp@1.0 \ vendor.qti.hardware.dsp@1.0 \ vendor.qti.hardware.fm@1.0_vendor \ - vendor.qti.hardware.iop@1.0 \ - vendor.qti.hardware.iop@2.0 \ vendor.qti.hardware.qccsyshal@1.0 \ vendor.qti.hardware.qseecom@1.0 \ vendor.qti.hardware.tui_comm@1.0 \ @@ -521,7 +516,6 @@ PRODUCT_PACKAGES += \ rild \ vendor.display.color@1.0-service \ vendor.qti.hardware.capabilityconfigstore@1.0-service \ - vendor.qti.hardware.iop@2.0-service \ vendor.qti.hardware.qseecom@1.0-service \ vendor.qti.hardware.tui_comm@1.0-service-qti \ vendor.qti.media.c2@1.0-service \