diff --git a/Android.bp b/Android.bp index 43151ed..e30b7eb 100644 --- a/Android.bp +++ b/Android.bp @@ -1479,125 +1479,6 @@ cc_prebuilt_library_shared { soc_specific: true, } -cc_prebuilt_library_shared { - name: "libTouchInputVM", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: ["proprietary/vendor/lib64/libTouchInputVM.so"], - shared_libs: ["liblog", "libhidlbase", "libutils", "vendor.qti.hardware.trustedui@1.0", "vendor.qti.hardware.trustedui@1.1", "vendor.qti.hardware.trustedui@1.2", "libc++", "libc", "libm", "libdl", ], - }, - }, - compile_multilib: "64", - prefer: true, - soc_specific: true, -} - -cc_prebuilt_library_shared { - name: "libTrustedInput", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: ["proprietary/vendor/lib64/libTrustedInput.so"], - shared_libs: ["liblog", "libhidlbase", "libbinder", "libutils", "libcutils", "vendor.qti.hardware.trustedui@1.0", "vendor.qti.hardware.trustedui@1.1", "vendor.qti.hardware.trustedui@1.2", "vendor.qti.hardware.systemhelper@1.0", "libTrustedInputTZ", "libTouchInputVM", "libc++", "libc", "libm", "libdl", ], - }, - }, - compile_multilib: "64", - prefer: true, - soc_specific: true, -} - -cc_prebuilt_library_shared { - name: "libTrustedInputTZ", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: ["proprietary/vendor/lib64/libTrustedInputTZ.so"], - shared_libs: ["liblog", "libhidlbase", "libbinder", "libutils", "libcutils", "libbase", "vendor.qti.hardware.trustedui@1.0", "vendor.qti.hardware.trustedui@1.1", "vendor.qti.hardware.trustedui@1.2", "libc++", "libc", "libm", "libdl", ], - }, - }, - compile_multilib: "64", - prefer: true, - soc_specific: true, -} - -cc_prebuilt_library_shared { - name: "libTrustedInputUtils", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: ["proprietary/vendor/lib64/libTrustedInputUtils.so"], - shared_libs: ["liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ], - }, - }, - compile_multilib: "64", - prefer: true, - soc_specific: true, -} - -cc_prebuilt_library_shared { - name: "libTrustedUI", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: ["proprietary/vendor/lib64/libTrustedUI.so"], - shared_libs: ["liblog", "libhidlbase", "libhidltransport", "libhwbinder", "libbinder", "libutils", "libcutils", "vendor.qti.hardware.trustedui@1.0", "vendor.qti.hardware.trustedui@1.1", "vendor.qti.hardware.trustedui@1.2", "vendor.qti.hardware.systemhelper@1.0", "libhidlmemory", "libcpion", "libc++", "libc", "libm", "libdl", ], - }, - }, - compile_multilib: "64", - prefer: true, - soc_specific: true, -} - -cc_prebuilt_library_shared { - name: "libTrustedUITZ", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: ["proprietary/vendor/lib64/libTrustedUITZ.so"], - shared_libs: ["liblog", "libhidlbase", "libbinder", "libutils", "libcutils", "libbase", "libcpion", "libsi", "libQSEEComAPI", "android.hardware.graphics.mapper@4.0", "vendor.qti.hardware.trustedui@1.0", "vendor.qti.hardware.trustedui@1.1", "vendor.qti.hardware.trustedui@1.2", "vendor.qti.hardware.systemhelper@1.0", "vendor.display.config@1.0", "libgralloc.qti", "libgralloctypes", "libdisplayconfig.qti", "libtrustedapploader", "libhidlmemory", "libc++", "libc", "libm", "libdl", ], - }, - }, - compile_multilib: "64", - prefer: true, - soc_specific: true, -} - -cc_prebuilt_library_shared { - name: "libTrustedUIVM", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: ["proprietary/vendor/lib64/libTrustedUIVM.so"], - shared_libs: ["liblog", "libhidlbase", "libhidltransport", "libhwbinder", "libbinder", "libutils", "libcutils", "libbase", "libminksocket_vendor", "libvmmem", "vendor.qti.hardware.trustedui@1.0", "vendor.qti.hardware.trustedui@1.1", "vendor.qti.hardware.trustedui@1.2", "vendor.qti.hardware.systemhelper@1.0", "libdisplayconfig.qti", "libtrustedapploader", "libminkdescriptor", "libhidlmemory", "android.hidl.allocator@1.0", "libcpion", "libc++", "libc", "libm", "libdl", ], - }, - }, - compile_multilib: "64", - prefer: true, - soc_specific: true, -} - cc_prebuilt_library_shared { name: "lib_bt_aptx", owner: "xiaomi", @@ -5530,23 +5411,6 @@ cc_prebuilt_library_shared { soc_specific: true, } -cc_prebuilt_library_shared { - name: "libsi", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: ["proprietary/vendor/lib64/libsi.so"], - shared_libs: ["libutils", "libcutils", "liblog", "libpng", "libQSEEComAPI", "libtrustedapploader", "libc++", "libc", "libm", "libdl", ], - }, - }, - compile_multilib: "64", - prefer: true, - soc_specific: true, -} - cc_prebuilt_library_shared { name: "libsilkyscrolls", owner: "xiaomi", @@ -8652,74 +8516,6 @@ cc_prebuilt_library_shared { soc_specific: true, } -cc_prebuilt_library_shared { - name: "vendor.qti.hardware.trustedui@1.0", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: ["proprietary/vendor/lib64/vendor.qti.hardware.trustedui@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.trustedui@1.1", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: ["proprietary/vendor/lib64/vendor.qti.hardware.trustedui@1.1.so"], - shared_libs: ["android.hidl.memory.block@1.0", "android.hidl.memory.token@1.0", "vendor.qti.hardware.trustedui@1.0", "libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ], - }, - }, - compile_multilib: "64", - prefer: true, - soc_specific: true, -} - -cc_prebuilt_library_shared { - name: "vendor.qti.hardware.trustedui@1.2", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: ["proprietary/vendor/lib64/vendor.qti.hardware.trustedui@1.2.so"], - shared_libs: ["android.hidl.memory.block@1.0", "android.hidl.memory.token@1.0", "vendor.qti.hardware.trustedui@1.0", "vendor.qti.hardware.trustedui@1.1", "libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ], - }, - }, - compile_multilib: "64", - prefer: true, - soc_specific: true, -} - -cc_prebuilt_library_shared { - name: "vendor.qti.hardware.tui_comm@1.0", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: ["proprietary/vendor/lib64/vendor.qti.hardware.tui_comm@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.vpp@1.1", owner: "xiaomi", @@ -11169,42 +10965,6 @@ cc_prebuilt_binary { soc_specific: true, } -cc_prebuilt_binary { - name: "vendor.qti.hardware.trustedui@1.0-service-qti", - owner: "xiaomi", - target: { - android_arm64: { - srcs: ["proprietary/vendor/bin/hw/vendor.qti.hardware.trustedui@1.0-service-qti"], - shared_libs: ["liblog", "libcutils", "libbase", "libutils", "libhardware", "libhidlbase", "vendor.qti.hardware.trustedui@1.0", "vendor.qti.hardware.trustedui@1.1", "vendor.qti.hardware.trustedui@1.2", "vendor.qti.hardware.systemhelper@1.0", "libTrustedUI", "libTrustedInput", "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.tui_comm@1.0-service-qti", - owner: "xiaomi", - target: { - android_arm64: { - srcs: ["proprietary/vendor/bin/hw/vendor.qti.hardware.tui_comm@1.0-service-qti"], - shared_libs: ["liblog", "libcutils", "libbase", "libutils", "libhardware", "libhidlbase", "libbinder", "vendor.qti.hardware.tui_comm@1.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.media.c2@1.0-service", owner: "xiaomi", @@ -12024,23 +11784,6 @@ cc_prebuilt_binary { soc_specific: true, } -cc_prebuilt_binary { - name: "trusteduilistener", - owner: "xiaomi", - target: { - android_arm64: { - srcs: ["proprietary/vendor/bin/trusteduilistener"], - shared_libs: ["libminksocket_vendor", "libdisplayconfig.qti", "liblog", "vendor.qti.hardware.systemhelper@1.0", "libhidlbase", "libutils", "libcutils", "libTrustedInputUtils", "libc++", "libc", "libm", "libdl", ], - }, - }, - compile_multilib: "64", - strip: { - none: true, - }, - prefer: true, - soc_specific: true, -} - cc_prebuilt_binary { name: "vendor.dpmd", owner: "xiaomi", diff --git a/proprietary/vendor/bin/hw/vendor.qti.hardware.trustedui@1.0-service-qti b/proprietary/vendor/bin/hw/vendor.qti.hardware.trustedui@1.0-service-qti deleted file mode 100755 index 1b0868a..0000000 Binary files a/proprietary/vendor/bin/hw/vendor.qti.hardware.trustedui@1.0-service-qti and /dev/null differ diff --git a/proprietary/vendor/bin/hw/vendor.qti.hardware.tui_comm@1.0-service-qti b/proprietary/vendor/bin/hw/vendor.qti.hardware.tui_comm@1.0-service-qti deleted file mode 100755 index 881958c..0000000 Binary files a/proprietary/vendor/bin/hw/vendor.qti.hardware.tui_comm@1.0-service-qti and /dev/null differ diff --git a/proprietary/vendor/bin/trusteduilistener b/proprietary/vendor/bin/trusteduilistener deleted file mode 100755 index 46cd65c..0000000 Binary files a/proprietary/vendor/bin/trusteduilistener and /dev/null differ diff --git a/proprietary/vendor/etc/init/trusteduilistener.rc b/proprietary/vendor/etc/init/trusteduilistener.rc deleted file mode 100644 index ca5fc5a..0000000 --- a/proprietary/vendor/etc/init/trusteduilistener.rc +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright (c) 2021 Qualcomm Technologies, Inc. -# All Rights Reserved. -# Confidential and Proprietary - Qualcomm Technologies, Inc. - -service vendor.trusteduilistener /vendor/bin/trusteduilistener - class late_start - user system - group system diff --git a/proprietary/vendor/etc/init/vendor.qti.hardware.trustedui@1.0-service-qti.rc b/proprietary/vendor/etc/init/vendor.qti.hardware.trustedui@1.0-service-qti.rc deleted file mode 100644 index 672ead6..0000000 --- a/proprietary/vendor/etc/init/vendor.qti.hardware.trustedui@1.0-service-qti.rc +++ /dev/null @@ -1,4 +0,0 @@ -service vendor.trustedui-1-0 /vendor/bin/hw/vendor.qti.hardware.trustedui@1.0-service-qti - class hal - user system - group system diff --git a/proprietary/vendor/etc/init/vendor.qti.hardware.tui_comm@1.0-service-qti.rc b/proprietary/vendor/etc/init/vendor.qti.hardware.tui_comm@1.0-service-qti.rc deleted file mode 100644 index 80317b4..0000000 --- a/proprietary/vendor/etc/init/vendor.qti.hardware.tui_comm@1.0-service-qti.rc +++ /dev/null @@ -1,4 +0,0 @@ -service tui_comm-1-0 /vendor/bin/hw/vendor.qti.hardware.tui_comm@1.0-service-qti - class hal - user system - group system drmrpc diff --git a/proprietary/vendor/lib64/libTouchInputVM.so b/proprietary/vendor/lib64/libTouchInputVM.so deleted file mode 100644 index 2262a68..0000000 Binary files a/proprietary/vendor/lib64/libTouchInputVM.so and /dev/null differ diff --git a/proprietary/vendor/lib64/libTrustedInput.so b/proprietary/vendor/lib64/libTrustedInput.so deleted file mode 100644 index 0abfbbe..0000000 Binary files a/proprietary/vendor/lib64/libTrustedInput.so and /dev/null differ diff --git a/proprietary/vendor/lib64/libTrustedInputTZ.so b/proprietary/vendor/lib64/libTrustedInputTZ.so deleted file mode 100644 index a157d4a..0000000 Binary files a/proprietary/vendor/lib64/libTrustedInputTZ.so and /dev/null differ diff --git a/proprietary/vendor/lib64/libTrustedInputUtils.so b/proprietary/vendor/lib64/libTrustedInputUtils.so deleted file mode 100644 index 7b42076..0000000 Binary files a/proprietary/vendor/lib64/libTrustedInputUtils.so and /dev/null differ diff --git a/proprietary/vendor/lib64/libTrustedUI.so b/proprietary/vendor/lib64/libTrustedUI.so deleted file mode 100644 index 01c7dc7..0000000 Binary files a/proprietary/vendor/lib64/libTrustedUI.so and /dev/null differ diff --git a/proprietary/vendor/lib64/libTrustedUITZ.so b/proprietary/vendor/lib64/libTrustedUITZ.so deleted file mode 100644 index 514930b..0000000 Binary files a/proprietary/vendor/lib64/libTrustedUITZ.so and /dev/null differ diff --git a/proprietary/vendor/lib64/libTrustedUIVM.so b/proprietary/vendor/lib64/libTrustedUIVM.so deleted file mode 100644 index b823d3c..0000000 Binary files a/proprietary/vendor/lib64/libTrustedUIVM.so and /dev/null differ diff --git a/proprietary/vendor/lib64/libsi.so b/proprietary/vendor/lib64/libsi.so deleted file mode 100644 index 37e6c6b..0000000 Binary files a/proprietary/vendor/lib64/libsi.so and /dev/null differ diff --git a/proprietary/vendor/lib64/vendor.qti.hardware.trustedui@1.0.so b/proprietary/vendor/lib64/vendor.qti.hardware.trustedui@1.0.so deleted file mode 100644 index d153e32..0000000 Binary files a/proprietary/vendor/lib64/vendor.qti.hardware.trustedui@1.0.so and /dev/null differ diff --git a/proprietary/vendor/lib64/vendor.qti.hardware.trustedui@1.1.so b/proprietary/vendor/lib64/vendor.qti.hardware.trustedui@1.1.so deleted file mode 100644 index b609f00..0000000 Binary files a/proprietary/vendor/lib64/vendor.qti.hardware.trustedui@1.1.so and /dev/null differ diff --git a/proprietary/vendor/lib64/vendor.qti.hardware.trustedui@1.2.so b/proprietary/vendor/lib64/vendor.qti.hardware.trustedui@1.2.so deleted file mode 100644 index f5e8581..0000000 Binary files a/proprietary/vendor/lib64/vendor.qti.hardware.trustedui@1.2.so and /dev/null differ diff --git a/proprietary/vendor/lib64/vendor.qti.hardware.tui_comm@1.0.so b/proprietary/vendor/lib64/vendor.qti.hardware.tui_comm@1.0.so deleted file mode 100644 index 3c0d57b..0000000 Binary files a/proprietary/vendor/lib64/vendor.qti.hardware.tui_comm@1.0.so and /dev/null differ diff --git a/sm8450-common-vendor.mk b/sm8450-common-vendor.mk index 5f5d23c..9311670 100644 --- a/sm8450-common-vendor.mk +++ b/sm8450-common-vendor.mk @@ -115,7 +115,6 @@ PRODUCT_COPY_FILES += \ vendor/xiaomi/sm8450-common/proprietary/vendor/etc/init/qms.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/qms.rc \ vendor/xiaomi/sm8450-common/proprietary/vendor/etc/init/qseecomd.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/qseecomd.rc \ vendor/xiaomi/sm8450-common/proprietary/vendor/etc/init/ssgtzd.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/ssgtzd.rc \ - vendor/xiaomi/sm8450-common/proprietary/vendor/etc/init/trusteduilistener.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/trusteduilistener.rc \ vendor/xiaomi/sm8450-common/proprietary/vendor/etc/init/vendor.display.color@1.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.display.color@1.0-service.rc \ vendor/xiaomi/sm8450-common/proprietary/vendor/etc/init/vendor.dpmd.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.dpmd.rc \ vendor/xiaomi/sm8450-common/proprietary/vendor/etc/init/vendor.qti.adsprpc-guestos-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.adsprpc-guestos-service.rc \ @@ -132,8 +131,6 @@ PRODUCT_COPY_FILES += \ vendor/xiaomi/sm8450-common/proprietary/vendor/etc/init/vendor.qti.hardware.sensorscalibrate@1.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.hardware.sensorscalibrate@1.0-service.rc \ vendor/xiaomi/sm8450-common/proprietary/vendor/etc/init/vendor.qti.hardware.servicetracker@1.2-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.hardware.servicetracker@1.2-service.rc \ vendor/xiaomi/sm8450-common/proprietary/vendor/etc/init/vendor.qti.hardware.soter@1.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.hardware.soter@1.0-service.rc \ - vendor/xiaomi/sm8450-common/proprietary/vendor/etc/init/vendor.qti.hardware.trustedui@1.0-service-qti.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.hardware.trustedui@1.0-service-qti.rc \ - vendor/xiaomi/sm8450-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/xiaomi/sm8450-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 \ vendor/xiaomi/sm8450-common/proprietary/vendor/etc/init/vendor.qti.media.c2audio@1.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.media.c2audio@1.0-service.rc \ vendor/xiaomi/sm8450-common/proprietary/vendor/etc/init/vendor.qti.qspmhal@1.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.qspmhal@1.0-service.rc \ @@ -334,13 +331,6 @@ PRODUCT_PACKAGES += \ libQTEEConnector_vendor \ libQcelp13SwCodec \ libQtiRilLoadable \ - libTouchInputVM \ - libTrustedInput \ - libTrustedInputTZ \ - libTrustedInputUtils \ - libTrustedUI \ - libTrustedUITZ \ - libTrustedUIVM \ lib_bt_aptx \ lib_bt_ble \ lib_bt_bundle \ @@ -572,7 +562,6 @@ PRODUCT_PACKAGES += \ libsensorslog \ libshsc \ libshsusr_verinfo \ - libsi \ libsilkyscrolls \ libskewknob \ libsn100u_fw \ @@ -755,10 +744,6 @@ PRODUCT_PACKAGES += \ vendor.qti.hardware.sensorscalibrate@1.0 \ vendor.qti.hardware.slmadapter@1.0 \ vendor.qti.hardware.soter@1.0 \ - vendor.qti.hardware.trustedui@1.0 \ - vendor.qti.hardware.trustedui@1.1 \ - vendor.qti.hardware.trustedui@1.2 \ - vendor.qti.hardware.tui_comm@1.0 \ vendor.qti.hardware.vpp@1.1 \ vendor.qti.hardware.vpp@1.2 \ vendor.qti.hardware.vpp@1.3 \ @@ -928,8 +913,6 @@ PRODUCT_PACKAGES += \ vendor.qti.hardware.sensorscalibrate@1.0-service \ vendor.qti.hardware.servicetracker@1.2-service \ vendor.qti.hardware.soter@1.0-service \ - vendor.qti.hardware.trustedui@1.0-service-qti \ - vendor.qti.hardware.tui_comm@1.0-service-qti \ vendor.qti.media.c2@1.0-service \ vendor.qti.media.c2audio@1.0-service \ vendor.qti.secure_element@1.2-service \ @@ -980,7 +963,6 @@ PRODUCT_PACKAGES += \ tftp_server \ thermal-engine-v2 \ time_daemon \ - trusteduilistener \ vendor.dpmd \ vendor.qti.hardware.soter@1.0-provision \ vendor.qti.qspmhal@1.0-service \