diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index 92679dc..ebc67c5 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -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 diff --git a/holi.mk b/holi.mk index 9f59879..e5a7874 100644 --- a/holi.mk +++ b/holi.mk @@ -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 += \ diff --git a/manifest_nfc.xml b/manifest_nfc.xml deleted file mode 100644 index 41ad3be..0000000 --- a/manifest_nfc.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - android.hardware.nfc - hwbinder - 1.2 - - INfc - default - - - - vendor.nxp.nxpnfc - hwbinder - 2.0 - - INxpNfc - default - - - - vendor.nxp.nxpnfclegacy - hwbinder - 1.0 - - INxpNfcLegacy - default - - - diff --git a/proprietary-files.txt b/proprietary-files.txt index 3fa0884..7dfa1a4 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -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 diff --git a/rootdir/etc/init.xiaomi.rc b/rootdir/etc/init.xiaomi.rc index 4a236ae..2e81dec 100644 --- a/rootdir/etc/init.xiaomi.rc +++ b/rootdir/etc/init.xiaomi.rc @@ -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