klte: Update pn54x HAL name for O

Change-Id: Ib230137a4b22722ace77463ca522b5370150c576
This commit is contained in:
Kevin F. Haggerty 2017-11-05 13:27:05 -07:00
parent 3ee701fac2
commit d575fa3f6b
3 changed files with 4 additions and 3 deletions

View File

@ -27,6 +27,7 @@ TARGET_LIBINIT_MSM8974_DEFINES_FILE := device/samsung/klte/init/init_klte.cpp
# NFC
BOARD_NFC_CHIPSET := pn547
BOARD_NFC_HAL_SUFFIX := msm8974
# Partitions
BOARD_BOOTIMAGE_PARTITION_SIZE := 13631488

View File

@ -320,7 +320,7 @@ NFA_MAX_EE_SUPPORTED=0x02
###############################################################################
# NCI Hal Module name
NCI_HAL_MODULE="nfc_nci.pn54x"
NCI_HAL_MODULE="nfc_nci"
###############################################################################
# Vendor Specific Proprietary Protocol & Discovery Configuration

View File

@ -24,12 +24,12 @@ $(call inherit-product-if-exists, vendor/samsung/klte/klte-vendor.mk)
DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay
# NFC
# See https://github.com/CyanogenMod/android_external_libnfc-nci/blob/cm-14.1/halimpl/pn54x/Android.mk#L21
# See https://github.com/LineageOS/android_system_nfc/blob/lineage-15.0/halimpl/pn54x/Android.mk#L15
# for magic values of NXP_CHIP_TYPE.
NXP_CHIP_TYPE := 1
PRODUCT_PACKAGES += \
libpn547_fw \
nfc_nci.pn54x.default
nfc_nci.msm8974
PRODUCT_COPY_FILES += \
$(LOCAL_PATH)/configs/libnfc-brcm.conf:system/etc/libnfc-brcm.conf \