diff --git a/Android.bp b/Android.bp index 55ffdc9..18aa5eb 100644 --- a/Android.bp +++ b/Android.bp @@ -192,37 +192,6 @@ cc_prebuilt_library_shared { soc_specific: true, } -cc_prebuilt_library_shared { - name: "android.hardware.secure_element-impl-gto", - owner: "samsung", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/vendor/lib64/android.hardware.secure_element-impl-gto.so", - ], - shared_libs: [ - "libbase", - "libcutils", - "libhardware", - "libhidlbase", - "liblog", - "libutils", - "libsec_semRil", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - prefer: true, - soc_specific: true, -} - cc_prebuilt_library_shared { name: "com.samsung.sensor.hi847", owner: "samsung", @@ -2105,39 +2074,6 @@ cc_prebuilt_library_shared { soc_specific: true, } -cc_prebuilt_library_shared { - name: "ese_spi_nxp", - owner: "samsung", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/vendor/lib64/ese_spi_nxp.so", - ], - shared_libs: [ - "android.hardware.secure_element@1.0", - "libcutils", - "libhardware", - "libhidlbase", - "libutils", - "liblog", - "libbase", - "libchrome", - "libsec_semRil", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - prefer: true, - soc_specific: true, -} - cc_prebuilt_library_shared { name: "android.hardware.gnss@2.1-impl-qti", owner: "samsung", @@ -3523,40 +3459,6 @@ cc_prebuilt_library_shared { soc_specific: true, } -cc_prebuilt_library_shared { - name: "nfc_nci_nxpsn", - owner: "samsung", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/vendor/lib64/nfc_nci_nxpsn.so", - ], - shared_libs: [ - "android.hardware.nfc@1.0", - "android.hardware.nfc@1.1", - "android.hardware.nfc@1.2", - "libbase", - "libcutils", - "libhardware", - "libhardware_legacy", - "libhidlbase", - "liblog", - "libutils", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - prefer: true, - soc_specific: true, -} - cc_prebuilt_library_shared { name: "nfc_nci_sec", owner: "samsung", @@ -4007,34 +3909,6 @@ cc_prebuilt_library_shared { soc_specific: true, } -cc_prebuilt_library_shared { - name: "vendor.samsung.hardware.nfc@2.0", - owner: "samsung", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/vendor/lib64/vendor.samsung.hardware.nfc@2.0.so", - ], - shared_libs: [ - "libhidlbase", - "liblog", - "libutils", - "libcutils", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - prefer: true, - soc_specific: true, -} - android_app_import { name: "CACertService", owner: "samsung", @@ -4092,109 +3966,6 @@ cc_prebuilt_binary { soc_specific: true, } -cc_prebuilt_binary { - name: "android.hardware.secure_element@1.0-service", - owner: "samsung", - target: { - android_arm64: { - srcs: [ - "proprietary/vendor/bin/hw/android.hardware.secure_element@1.0-service", - ], - shared_libs: [ - "android.hardware.secure_element@1.0", - "ese_spi_nxp", - "libbase", - "libcutils", - "libhardware", - "libhidlbase", - "liblog", - "libutils", - "libchrome", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - strip: { - none: true, - }, - prefer: true, - relative_install_path: "hw", - soc_specific: true, -} - -cc_prebuilt_binary { - name: "android.hardware.secure_element@1.0-service-gto", - owner: "samsung", - target: { - android_arm64: { - srcs: [ - "proprietary/vendor/bin/hw/android.hardware.secure_element@1.0-service-gto", - ], - shared_libs: [ - "android.hardware.secure_element@1.0", - "android.hardware.secure_element-impl-gto", - "libbase", - "libcutils", - "libhardware", - "libhidlbase", - "liblog", - "libutils", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - strip: { - none: true, - }, - prefer: true, - relative_install_path: "hw", - soc_specific: true, -} - -cc_prebuilt_binary { - name: "nxp.android.hardware.nfc@1.2-service", - owner: "samsung", - target: { - android_arm64: { - srcs: [ - "proprietary/vendor/bin/hw/nxp.android.hardware.nfc@1.2-service", - ], - shared_libs: [ - "nfc_nci_nxpsn", - "libbase", - "libcutils", - "libhardware", - "liblog", - "libutils", - "android.hardware.nfc@1.0", - "android.hardware.nfc@1.1", - "android.hardware.nfc@1.2", - "libhidlbase", - "vendor.samsung.hardware.nfc@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: "loc_launcher", owner: "samsung", diff --git a/proprietary/vendor/bin/hw/android.hardware.secure_element@1.0-service b/proprietary/vendor/bin/hw/android.hardware.secure_element@1.0-service deleted file mode 100755 index 301b944..0000000 Binary files a/proprietary/vendor/bin/hw/android.hardware.secure_element@1.0-service and /dev/null differ diff --git a/proprietary/vendor/bin/hw/android.hardware.secure_element@1.0-service-gto b/proprietary/vendor/bin/hw/android.hardware.secure_element@1.0-service-gto deleted file mode 100755 index ee3bf4b..0000000 Binary files a/proprietary/vendor/bin/hw/android.hardware.secure_element@1.0-service-gto and /dev/null differ diff --git a/proprietary/vendor/bin/hw/nxp.android.hardware.nfc@1.2-service b/proprietary/vendor/bin/hw/nxp.android.hardware.nfc@1.2-service deleted file mode 100755 index 7cb0208..0000000 Binary files a/proprietary/vendor/bin/hw/nxp.android.hardware.nfc@1.2-service and /dev/null differ diff --git a/proprietary/vendor/etc/init/android.hardware.secure_element@1.0-service-gto-sku.rc b/proprietary/vendor/etc/init/android.hardware.secure_element@1.0-service-gto-sku.rc deleted file mode 100644 index b88c6f9..0000000 --- a/proprietary/vendor/etc/init/android.hardware.secure_element@1.0-service-gto-sku.rc +++ /dev/null @@ -1,8 +0,0 @@ -service vendor.secure_element_hal_service-gto /vendor/bin/hw/android.hardware.secure_element@1.0-service-gto - class hal - disabled - user system - group system - -on property:ro.boot.hardware.sku=s3fwrn5 - start vendor.secure_element_hal_service-gto diff --git a/proprietary/vendor/etc/init/android.hardware.secure_element@1.0-service-sku.rc b/proprietary/vendor/etc/init/android.hardware.secure_element@1.0-service-sku.rc deleted file mode 100644 index 6c6f4d1..0000000 --- a/proprietary/vendor/etc/init/android.hardware.secure_element@1.0-service-sku.rc +++ /dev/null @@ -1,8 +0,0 @@ -service vendor.secure_element_hal_service /vendor/bin/hw/android.hardware.secure_element@1.0-service - class hal - disabled - user system - group system - -on property:ro.boot.hardware.sku=sn110t - start vendor.secure_element_hal_service diff --git a/proprietary/vendor/etc/init/nxp.android.hardware.nfc@1.2-service.rc b/proprietary/vendor/etc/init/nxp.android.hardware.nfc@1.2-service.rc deleted file mode 100644 index 20531da..0000000 --- a/proprietary/vendor/etc/init/nxp.android.hardware.nfc@1.2-service.rc +++ /dev/null @@ -1,10 +0,0 @@ -service vendor.nfc_hal_service /vendor/bin/hw/nxp.android.hardware.nfc@1.2-service - interface android.hardware.nfc@1.0::INfc default - interface android.hardware.nfc@1.1::INfc default - interface android.hardware.nfc@1.2::INfc default - interface vendor.samsung.hardware.nfc@2.0::ISehNfc default - class hal - oneshot - disabled - user nfc - group nfc net_bt_admin diff --git a/proprietary/vendor/lib64/android.hardware.secure_element-impl-gto.so b/proprietary/vendor/lib64/android.hardware.secure_element-impl-gto.so deleted file mode 100644 index 26d7612..0000000 Binary files a/proprietary/vendor/lib64/android.hardware.secure_element-impl-gto.so and /dev/null differ diff --git a/proprietary/vendor/lib64/ese_spi_nxp.so b/proprietary/vendor/lib64/ese_spi_nxp.so deleted file mode 100644 index 0893ba2..0000000 Binary files a/proprietary/vendor/lib64/ese_spi_nxp.so and /dev/null differ diff --git a/proprietary/vendor/lib64/nfc_nci_nxpsn.so b/proprietary/vendor/lib64/nfc_nci_nxpsn.so deleted file mode 100644 index 84f37d4..0000000 Binary files a/proprietary/vendor/lib64/nfc_nci_nxpsn.so and /dev/null differ diff --git a/proprietary/vendor/lib64/vendor.samsung.hardware.nfc@2.0.so b/proprietary/vendor/lib64/vendor.samsung.hardware.nfc@2.0.so deleted file mode 100644 index dbd43f0..0000000 Binary files a/proprietary/vendor/lib64/vendor.samsung.hardware.nfc@2.0.so and /dev/null differ diff --git a/r8q-vendor.mk b/r8q-vendor.mk index 71a2dee..200a3d6 100644 --- a/r8q-vendor.mk +++ b/r8q-vendor.mk @@ -20,9 +20,6 @@ PRODUCT_COPY_FILES += \ vendor/samsung/r8q/proprietary/vendor/etc/gnss_antenna_info.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss_antenna_info.conf \ vendor/samsung/r8q/proprietary/vendor/etc/gps.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gps.conf \ vendor/samsung/r8q/proprietary/vendor/etc/init/android.hardware.gnss@2.1-service-qti.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.gnss@2.1-service-qti.rc \ - vendor/samsung/r8q/proprietary/vendor/etc/init/android.hardware.secure_element@1.0-service-gto-sku.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.secure_element@1.0-service-gto-sku.rc \ - vendor/samsung/r8q/proprietary/vendor/etc/init/android.hardware.secure_element@1.0-service-sku.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.secure_element@1.0-service-sku.rc \ - vendor/samsung/r8q/proprietary/vendor/etc/init/nxp.android.hardware.nfc@1.2-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/nxp.android.hardware.nfc@1.2-service.rc \ vendor/samsung/r8q/proprietary/vendor/etc/izat.conf:$(TARGET_COPY_OUT_VENDOR)/etc/izat.conf \ vendor/samsung/r8q/proprietary/vendor/etc/libese-nxp.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libese-nxp.conf \ vendor/samsung/r8q/proprietary/vendor/etc/libse-gto-hal.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal.conf \ @@ -102,7 +99,6 @@ PRODUCT_PACKAGES += \ X12QS_libTsAf \ X12QS_libTsAwb \ X12QS_libTsPdafm \ - android.hardware.secure_element-impl-gto \ com.samsung.sensor.hi847 \ com.samsung.sensor.imx555 \ com.samsung.sensor.imx616 \ @@ -159,7 +155,6 @@ PRODUCT_PACKAGES += \ com.qti.feature2.serializer \ com.qti.feature2.stub \ com.qti.feature2.swmf \ - ese_spi_nxp \ android.hardware.gnss@2.1-impl-qti \ com.qti.chi.override \ vendor.samsung.hardware.gnss@2.0-impl-sec \ @@ -207,7 +202,6 @@ PRODUCT_PACKAGES += \ libtriplecam_optical_zoom_control \ libtriplecam_video_optical_zoom \ libvdis_interface \ - nfc_nci_nxpsn \ nfc_nci_sec \ sensors.flicker \ sensors.grip \ @@ -222,13 +216,9 @@ PRODUCT_PACKAGES += \ vendor.qti.hardware.cacert@1.0 \ vendor.qti.hardware.qccsyshal@1.0 \ vendor.samsung.hardware.gnss@2.0 \ - vendor.samsung.hardware.nfc@2.0 \ CACertService \ android.hardware.gnss@2.1-service-qti.xml \ android.hardware.gnss@2.1-service-qti \ - android.hardware.secure_element@1.0-service \ - android.hardware.secure_element@1.0-service-gto \ - nxp.android.hardware.nfc@1.2-service \ loc_launcher \ lowi-server \ xtra-daemon