Revert "r8q: Remove blobbed NXP and Secure Element hals"

This reverts commit be61fbc642.

Android.bp

@@ -192,6 +192,37 @@ 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",
@@ -2074,6 +2105,39 @@ 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",
@@ -3459,6 +3523,40 @@ 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",
@@ -3909,6 +4007,34 @@ 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",
@@ -3966,6 +4092,109 @@ 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",

proprietary/vendor/etc/init/android.hardware.secure_element@1.0-service-gto-sku.rc

@@ -0,0 +1,8 @@
+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

proprietary/vendor/etc/init/android.hardware.secure_element@1.0-service-sku.rc

@@ -0,0 +1,8 @@
+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

proprietary/vendor/etc/init/nxp.android.hardware.nfc@1.2-service.rc

@@ -0,0 +1,10 @@
+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

r8q-vendor.mk

@@ -20,6 +20,9 @@ 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 \
@@ -99,6 +102,7 @@ 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 \
@@ -155,6 +159,7 @@ 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 \
@@ -202,6 +207,7 @@ PRODUCT_PACKAGES += \
     libtriplecam_optical_zoom_control \
     libtriplecam_video_optical_zoom \
     libvdis_interface \
+    nfc_nci_nxpsn \
     nfc_nci_sec \
     sensors.flicker \
     sensors.grip \
@@ -216,9 +222,13 @@ 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