From 17aa9e3b1552b6c89a5ad393ff9ec8ed3f11a084 Mon Sep 17 00:00:00 2001 From: LuK1337 Date: Tue, 23 Jun 2020 21:04:53 +0200 Subject: [PATCH] sm8250-common: Bring back prebuilt NxpNfcNci --- common.mk | 11 +++- configs/libnfc-nci.conf | 126 +++++++++++++++++++++++++++++++++++++ proprietary-files.txt | 8 +++ remove_packages/Android.mk | 11 ++++ 4 files changed, 155 insertions(+), 1 deletion(-) create mode 100644 configs/libnfc-nci.conf create mode 100644 remove_packages/Android.mk diff --git a/common.mk b/common.mk index df03937..f0b5315 100644 --- a/common.mk +++ b/common.mk @@ -149,8 +149,13 @@ PRODUCT_PACKAGES += \ android.hardware.nfc@1.2:64 \ android.hardware.secure_element@1.0:64 \ com.android.nfc_extras \ - NfcNci \ + SecureElement \ Tag \ + vendor.nxp.nxpese@1.0:64 \ + vendor.nxp.nxpnfc@1.0:64 + +PRODUCT_COPY_FILES += \ + $(LOCAL_PATH)/configs/libnfc-nci.conf:$(TARGET_COPY_OUT_PRODUCT)/vendor_overlay/$(PRODUCT_TARGET_VNDK_VERSION)/etc/libnfc-nci.conf # Power PRODUCT_PACKAGES += \ @@ -160,6 +165,10 @@ PRODUCT_PACKAGES += \ PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/rootdir/etc/fstab.qcom:$(TARGET_COPY_OUT_RAMDISK)/fstab.qcom +# Remove unwanted packages +PRODUCT_PACKAGES += \ + RemovePackages + # Soong namespaces PRODUCT_SOONG_NAMESPACES += \ $(LOCAL_PATH) \ diff --git a/configs/libnfc-nci.conf b/configs/libnfc-nci.conf new file mode 100644 index 0000000..6668684 --- /dev/null +++ b/configs/libnfc-nci.conf @@ -0,0 +1,126 @@ +########################## Start of libnfc-nci.conf ########################### +############################################################################### +# Application options +NFC_DEBUG_ENABLED=1 +############################################################################### +# performance measurement +# Change this setting to control how often USERIAL log the performance (throughput) +# data on read/write/poll +# defailt is to log performance dara for every 100 read or write +#REPORT_PERFORMANCE_MEASURE=100 +############################################################################### +# File used for NFA storage +NFA_STORAGE="/data/nfc" +############################################################################### +# Configure the default NfcA/IsoDep techology and protocol route. Can be +# either a secure element (e.g. 0xF4) or the host (0x00) +#DEFAULT_ISODEP_ROUTE=0x00 + +############################################################################### +## Default poll duration (in ms) +## The defualt is 500ms if not set +NFA_DM_DISC_DURATION_POLL=500 + +############################################################################### +# Force UICC to only listen to the following technology(s). +# The bits are defined as tNFA_TECHNOLOGY_MASK in nfa_api.h. +# Default is NFA_TECHNOLOGY_MASK_A | NFA_TECHNOLOGY_MASK_B | NFA_TECHNOLOGY_MASK_F +UICC_LISTEN_TECH_MASK=0x07 + +############################################################################### +# Force HOST listen feature enable or disable. +# 0: Disable +# 1: Enable +HOST_LISTEN_ENABLE=0x01 +############################################################################### +# When screen is turned off, specify the desired power state of the controller. +# 0: power-off-sleep state; DEFAULT +# 1: full-power state +# 2: screen-off card-emulation (CE4/CE3/CE1 modes are used) +SCREEN_OFF_POWER_STATE=1 +############################################################################### +# Force tag polling for the following technology(s). +# The bits are defined as tNFA_TECHNOLOGY_MASK in nfa_api.h. +# Default is NFA_TECHNOLOGY_MASK_A | NFA_TECHNOLOGY_MASK_B | +# NFA_TECHNOLOGY_MASK_F | NFA_TECHNOLOGY_MASK_ISO15693 | +# NFA_TECHNOLOGY_MASK_B_PRIME | +# NFA_TECHNOLOGY_MASK_A_ACTIVE | NFA_TECHNOLOGY_MASK_F_ACTIVE. +# +# Notable bits: +# NFA_TECHNOLOGY_MASK_A 0x01 /* NFC Technology A */ +# NFA_TECHNOLOGY_MASK_B 0x02 /* NFC Technology B */ +# NFA_TECHNOLOGY_MASK_F 0x04 /* NFC Technology F */ +# NFA_TECHNOLOGY_MASK_ISO15693 0x08 /* Proprietary Technology */ +# NFA_TECHNOLOGY_MASK_A_ACTIVE 0x40 /* NFC Technology A active mode */ +# NFA_TECHNOLOGY_MASK_F_ACTIVE 0x80 /* NFC Technology F active mode */ +POLLING_TECH_MASK=0xCF +############################################################################### +# Force P2P to only listen for the following technology(s). +# The bits are defined as tNFA_TECHNOLOGY_MASK in nfa_api.h. +# Default is NFA_TECHNOLOGY_MASK_A | NFA_TECHNOLOGY_MASK_F | +# NFA_TECHNOLOGY_MASK_A_ACTIVE | NFA_TECHNOLOGY_MASK_F_ACTIVE +# +# Notable bits: +# NFA_TECHNOLOGY_MASK_A 0x01 /* NFC Technology A */ +# NFA_TECHNOLOGY_MASK_F 0x04 /* NFC Technology F */ +# NFA_TECHNOLOGY_MASK_A_ACTIVE 0x40 /* NFC Technology A active mode */ +# NFA_TECHNOLOGY_MASK_F_ACTIVE 0x80 /* NFC Technology F active mode */ +P2P_LISTEN_TECH_MASK=0xC4 +############################################################################### +PRESERVE_STORAGE=0x01 +############################################################################### +# Override the stack default for NFA_EE_MAX_EE_SUPPORTED set in nfc_target.h. +# The value is set to 3 by default as it assumes we will discover 0xF2, +# 0xF3, and 0xF4. If a platform will exclude and SE, this value can be reduced +# so that the stack will not wait any longer than necessary. + +# Maximum EE supported number +# NXP PN547C2 0x02 +# NXP PN65T 0x03 +# NXP PN548C2 0x02 +# NXP PN66T 0x03 +NFA_MAX_EE_SUPPORTED=0x03 +############################################################################## +# Deactivate notification wait time out in seconds used in ETSI Reader mode +# 0 - Infinite wait +NFA_DM_DISC_NTF_TIMEOUT=0 + +############################################################################### +# AID_MATCHING constants +# AID_MATCHING_EXACT_ONLY 0x00 +# AID_MATCHING_EXACT_OR_PREFIX 0x01 +# AID_MATCHING_PREFIX_ONLY 0x02 +#AID_MATCHING_EXACT_OR_SUBSET_OR_PREFIX 0x03 +AID_MATCHING_MODE=0x03 +############################################################################### +# Preferred Secure Element for Technology based routing +# eSE 0x01 +# UICC 0x02 + +NXP_PRFD_TECH_SE=0x01 + +################################################################################ +#Set bit to 1 , black list is enabled +#Set bit to 0, to disable balcklist +NFA_AID_BLOCK_ROUTE=0x00 + +################################################################################ +# Maximum WTX requests entertained by MW +NXP_WM_MAX_WTX_COUNT=240 +################################################################################ +#Set the default Felica T3T System Code : +#This settings will be used when application does not set this parameter +DEFAULT_SYS_CODE={FE:FE} +######################################################################### +#Set NCI credit notification timeout value +NXP_NCI_CREDIT_NTF_TIMEOUT=2 +######################################################################### + +############################################################################### +# Firmware patch format, Only 1 and 5 should be set +# 0 -> NFC Default +# 1 -> EMVCO Default +# 3 -> EMVCO Polling, DISC_IDLE = POWER_OFF, DISC DEACTIVATE = Removal process +# 5 -> EMVCO Cert Polling, DISC_IDLE = Removal process , DISC DEACTIVATE = POWER_OFF +# 7 -> EMVCO Polling, DISC_IDLE = POWER_OFF, DISC DEACTIVATE = POWER_OFF +NFA_CONFIG_FORMAT=1 diff --git a/proprietary-files.txt b/proprietary-files.txt index 98e12c7..209af7f 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -55,6 +55,14 @@ lib/libmmparser_lite.so lib/libOmxMux.so lib64/libmmosal.so +# NFC +-app/NxpNfcNci/NxpNfcNci.apk|acb45c0f0fb12508fd2e3849d24eb23c791b8ed0 +etc/nfcee_access.xml +etc/permissions/com.nxp.nfc.xml +framework/com.nxp.nfc.jar +lib64/libnxpnfc_nci_jni.so +lib64/libnxpnfc-nci.so + # Telephony etc/permissions/privapp-permissions-qti.xml etc/permissions/qti_libpermissions.xml diff --git a/remove_packages/Android.mk b/remove_packages/Android.mk new file mode 100644 index 0000000..fcf8d93 --- /dev/null +++ b/remove_packages/Android.mk @@ -0,0 +1,11 @@ +LOCAL_PATH := $(call my-dir) + +include $(CLEAR_VARS) +LOCAL_MODULE := RemovePackages +LOCAL_MODULE_CLASS := APPS +LOCAL_MODULE_TAGS := optional +LOCAL_OVERRIDES_PACKAGES := NfcNci +LOCAL_UNINSTALLABLE_MODULE := true +LOCAL_CERTIFICATE := PRESIGNED +LOCAL_SRC_FILES := /dev/null +include $(BUILD_PREBUILT)