diff options
| author | Andrew Hexen <SyberHexen@gmail.com> | 2020-09-26 11:51:58 -0700 |
|---|---|---|
| committer | Andrew Hexen <SyberHexen@gmail.com> | 2020-10-02 22:37:19 -0700 |
| commit | 3039cc95e03b60e1cc48a29026f0e5d5b63c8c41 (patch) | |
| tree | 2d46aef839cb67a85c6dbe30586007234fe939ea | |
| parent | 8dd51e68dec1a3b5293762509c9c292608326617 (diff) | |
ocean: import NFC from common.
as of 'I66438c4d62384896b44190127f6ead09f640b9f4'
* Here we also adjust for having NFC-ST, rename libnfc-nci-st.conf to libncf-nci.conf as this is the expected file name.
Signed-off-by: Andrew Hexen <SyberHexen@gmail.com>
Change-Id: I33c2f19e6917034a6117285d946fd8c73cf9c431
| -rw-r--r-- | BoardConfig.mk | 3 | ||||
| -rw-r--r-- | device.mk | 18 | ||||
| -rw-r--r-- | rootdir/etc/init.ocean.rc | 2 |
3 files changed, 17 insertions, 6 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk index 392b371..777ea2c 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -28,9 +28,6 @@ TARGET_OTA_ASSERT_DEVICE := ocean # Kernel TARGET_KERNEL_CONFIG := ocean_defconfig -# NFC -BOARD_NFC_CHIPSET := pn553 - # Partitions BOARD_BOOTIMAGE_PARTITION_SIZE := 33554432 # 32768 * 1024 mmcblk0p41-42 BOARD_SYSTEMIMAGE_PARTITION_SIZE := 2885681152 # 2818048 * 1024 mmcblk0p62-63 @@ -62,10 +62,24 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ init.ocean.rc -# NFC +# NFC and Secure Element packages +PRODUCT_COPY_FILES += \ + frameworks/native/data/etc/android.hardware.nfc.xml:$(TARGET_COPY_OUT_ODM)/etc/permissions/sku_nfc-st/android.hardware.nfc.xml \ + frameworks/native/data/etc/android.hardware.nfc.hce.xml:$(TARGET_COPY_OUT_ODM)/etc/permissions/sku_nfc-st/android.hardware.nfc.hce.xml \ + frameworks/native/data/etc/android.hardware.nfc.hcef.xml:$(TARGET_COPY_OUT_ODM)/etc/permissions/sku_nfc-st/android.hardware.nfc.hcef.xml \ + frameworks/native/data/etc/android.hardware.nfc.uicc.xml:$(TARGET_COPY_OUT_ODM)/etc/permissions/sku_nfc-st/android.hardware.nfc.uicc.xml + PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/nfc/libnfc-hal-st.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-hal-st.conf \ - $(LOCAL_PATH)/nfc/libnfc-nci-st.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-nci-st.conf \ + $(LOCAL_PATH)/nfc/libnfc-nci-st.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-nci.conf + +PRODUCT_PACKAGES += \ + com.android.nfc_extras \ + NfcNci \ + Tag \ + SecureElement \ + android.hardware.nfc@1.2-service.st \ + android.hardware.secure_element@1.2-service.st # Sensors PRODUCT_COPY_FILES += \ diff --git a/rootdir/etc/init.ocean.rc b/rootdir/etc/init.ocean.rc index 7dc6bab..ed7a820 100644 --- a/rootdir/etc/init.ocean.rc +++ b/rootdir/etc/init.ocean.rc @@ -26,4 +26,4 @@ # on init && property:ro.boot.hardware.sku=XT1955-7 - setprop ro.boot.product.hardware.sku nfc + setprop ro.boot.product.hardware.sku nfc-st |