sm6375-common: Decommonize NFC build target

* moonstone/sunstone use NFC.st HALs

Change-Id: I2d21f1ad9d3ababd22d8b7f9eac5d45e95052984
This commit is contained in:
boedhack99
2023-06-26 20:23:48 +07:00
parent 761047ace4
commit 8acb8e3a94
5 changed files with 3 additions and 76 deletions

View File

@@ -76,9 +76,6 @@ DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE := \
$(COMMON_PATH)/framework_compatibility_matrix.xml \
vendor/lineage/config/device_framework_matrix.xml
ODM_MANIFEST_SKUS += nfc
ODM_MANIFEST_NFC_FILES := $(COMMON_PATH)/manifest_nfc.xml
# Kernel
BOARD_INCLUDE_DTB_IN_BOOTIMG := true
BOARD_KERNEL_BASE := 0x00000000

10
holi.mk
View File

@@ -254,7 +254,6 @@ PRODUCT_PACKAGES += \
# NFC
PRODUCT_PACKAGES += \
android.hardware.nfc@1.0-impl \
android.hardware.secure_element@1.0.vendor \
com.android.nfc_extras \
libchrome.vendor \
@@ -285,12 +284,7 @@ PRODUCT_COPY_FILES += \
frameworks/native/data/etc/android.hardware.consumerir.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.consumerir.xml \
frameworks/native/data/etc/android.hardware.fingerprint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.fingerprint.xml \
frameworks/native/data/etc/android.hardware.location.gps.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.location.gps.xml \
frameworks/native/data/etc/android.hardware.nfc.hce.xml:$(TARGET_COPY_OUT_ODM)/etc/permissions/sku_nfc/android.hardware.nfc.hce.xml \
frameworks/native/data/etc/android.hardware.nfc.hcef.xml:$(TARGET_COPY_OUT_ODM)/etc/permissions/sku_nfc/android.hardware.nfc.hcef.xml \
frameworks/native/data/etc/android.hardware.nfc.uicc.xml:$(TARGET_COPY_OUT_ODM)/etc/permissions/sku_nfc/android.hardware.nfc.uicc.xml \
frameworks/native/data/etc/android.hardware.nfc.xml:$(TARGET_COPY_OUT_ODM)/etc/permissions/sku_nfc/android.hardware.nfc.xml \
frameworks/native/data/etc/android.hardware.opengles.aep.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.opengles.aep.xml \
frameworks/native/data/etc/android.hardware.se.omapi.ese.xml:$(TARGET_COPY_OUT_ODM)/etc/permissions/sku_nfc/android.hardware.se.omapi.ese.xml \
frameworks/native/data/etc/android.hardware.se.omapi.uicc.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.se.omapi.uicc.xml \
frameworks/native/data/etc/android.hardware.sensor.accelerometer.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.accelerometer.xml \
frameworks/native/data/etc/android.hardware.sensor.barometer.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.barometer.xml \
@@ -324,9 +318,7 @@ PRODUCT_COPY_FILES += \
frameworks/native/data/etc/android.hardware.vulkan.compute-0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.compute-0.xml \
frameworks/native/data/etc/android.hardware.vulkan.level-1.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.level-1.xml \
frameworks/native/data/etc/android.hardware.vulkan.version-1_1.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.version-1_1.xml \
frameworks/native/data/etc/android.software.vulkan.deqp.level-2020-03-01.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.vulkan.deqp.level.xml \
frameworks/native/data/etc/com.android.nfc_extras.xml:$(TARGET_COPY_OUT_ODM)/etc/permissions/sku_nfc/com.android.nfc_extras.xml \
frameworks/native/data/etc/com.nxp.mifare.xml:$(TARGET_COPY_OUT_ODM)/etc/permissions/sku_nfc/com.nxp.mifare.xml
frameworks/native/data/etc/android.software.vulkan.deqp.level-2020-03-01.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.vulkan.deqp.level.xml
# Power
PRODUCT_PACKAGES += \

View File

@@ -1,29 +0,0 @@
<manifest version="2.0" type="device">
<hal format="hidl">
<name>android.hardware.nfc</name>
<transport>hwbinder</transport>
<version>1.2</version>
<interface>
<name>INfc</name>
<instance>default</instance>
</interface>
</hal>
<hal format="hidl">
<name>vendor.nxp.nxpnfc</name>
<transport>hwbinder</transport>
<version>2.0</version>
<interface>
<name>INxpNfc</name>
<instance>default</instance>
</interface>
</hal>
<hal format="hidl">
<name>vendor.nxp.nxpnfclegacy</name>
<transport>hwbinder</transport>
<version>1.0</version>
<interface>
<name>INxpNfcLegacy</name>
<instance>default</instance>
</interface>
</hal>
</manifest>

View File

@@ -441,30 +441,6 @@ vendor/lib64/unnhal-acc-common.so
vendor/lib64/unnhal-acc-gpu.so
vendor/lib64/unnhal-acc-hvx.so
# NFC
vendor/bin/hw/android.hardware.nfc@1.2-service
vendor/bin/nqnfcinfo
vendor/etc/init/android.hardware.nfc@1.2-service.rc
vendor/etc/init/init.veux.nfc.rc
vendor/etc/init/init.veux.se.rc
vendor/etc/permissions/com.nxp.nfc.xml:odm/etc/permissions/sku_nfc/com.nxp.nfc.xml
vendor/etc/libese-nxp.conf
vendor/etc/libnfc-mtp-SN100.conf
vendor/etc/libnfc-mtp-SN100_38_4MHZ.conf
vendor/etc/libnfc-nci.conf
vendor/etc/libnfc-nxp.conf
vendor/etc/libnfc-qrd-SN100_38_4MHZ.conf
vendor/lib64/ese_client.so
vendor/lib64/ese_spi_nxp.so
vendor/lib64/hal_libnfc.so
vendor/lib64/libpn557_fw.so
vendor/lib64/ls_client.so
vendor/lib64/nfc_nci_nxp.so
vendor/lib64/vendor.nxp.eventprocessor@1.0.so
vendor/lib64/vendor.nxp.nxpnfc@2.0.so
vendor/lib64/vendor.nxp.nxpnfclegacy@1.0.so
vendor/libnfc-nxp_RF.conf
# OMX
vendor/lib/libAlacSwDec.so
vendor/lib/libApeSwDec.so

View File

@@ -4,6 +4,8 @@
# SPDX-License-Identifier: Apache-2.0
#
import vendor/etc/init/hw/init.device.rc
# Fingerprint
on boot
#for silead fingeprint
@@ -33,14 +35,3 @@ on boot
chmod 0644 /sys/bus/platform/devices/soc:fpc1020/regulator_enable
chmod 0644 /sys/bus/platform/devices/soc:fpc1020/compatible_all
chmod 0644 /sys/bus/platform/devices/soc:fpc1020/fingerdown_wait
# NFC
service vendor.nfc_hal_service /vendor/bin/hw/android.hardware.nfc@1.2-service
override
class hal
user nfc
group nfc
disabled
on boot && property:ro.boot.product.hardware.sku=nfc
enable vendor.nfc_hal_service