Switch NFC from HIDL to AIDL am: 531b2600a5

Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2098739

Change-Id: I6f968f15ce081b5177298c2b81d4df5ab09ea88e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
George Chang 2022-05-19 07:55:23 +00:00 committed by Automerger Merge Worker
commit 20dc72203a
7 changed files with 10 additions and 16 deletions

View file

@ -114,7 +114,7 @@ PRODUCT_COPY_FILES += \
PRODUCT_PACKAGES += \
NfcNci \
Tag \
android.hardware.nfc@1.2-service.st
android.hardware.nfc-service.st
# SecureElement
PRODUCT_PACKAGES += \
@ -126,7 +126,6 @@ PRODUCT_COPY_FILES += \
device/google/raviole/nfc/libse-gto-hal.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal.conf
DEVICE_MANIFEST_FILE += \
device/google/raviole/nfc/manifest_nfc.xml \
device/google/raviole/nfc/manifest_se.xml
# Vibrator HAL

View file

@ -129,7 +129,7 @@ endif
PRODUCT_PACKAGES += \
NfcNci \
Tag \
android.hardware.nfc@1.2-service.st
android.hardware.nfc-service.st
# SecureElement
PRODUCT_PACKAGES += \
@ -141,7 +141,6 @@ PRODUCT_COPY_FILES += \
device/google/raviole/nfc/libse-gto-hal.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal.conf
DEVICE_MANIFEST_FILE += \
device/google/raviole/nfc/manifest_nfc.xml \
device/google/raviole/nfc/manifest_se.xml
# Vibrator HAL

View file

@ -83,7 +83,7 @@ PRODUCT_COPY_FILES += \
PRODUCT_PACKAGES += \
NfcNci \
Tag \
android.hardware.nfc@1.2-service.st
android.hardware.nfc-service.st
# SecureElement
PRODUCT_PACKAGES += \
@ -96,7 +96,6 @@ PRODUCT_COPY_FILES += \
device/google/raviole/nfc/libse-gto-hal2.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal2.conf
DEVICE_MANIFEST_FILE += \
device/google/raviole/nfc/manifest_nfc.xml \
device/google/raviole/nfc/manifest_se.xml
# PowerStats HAL

View file

@ -75,10 +75,7 @@ PRODUCT_COPY_FILES += \
PRODUCT_PACKAGES += \
NfcNci \
Tag \
android.hardware.nfc@1.2-service.st
DEVICE_MANIFEST_FILE += \
device/google/raviole/nfc/manifest_nfc.xml
android.hardware.nfc-service.st
# PowerStats HAL
PRODUCT_SOONG_NAMESPACES += device/google/raviole/powerstats/whitefin

View file

@ -60,8 +60,8 @@ PRESENCE_CHECK_ALGORITHM=5
NCI_HAL_MODULE="nfc_nci.st21nfc"
###############################################################################
# White list to be set at startup.
DEVICE_HOST_WHITE_LIST={02:C0}
# Allow list to be set at startup.
DEVICE_HOST_ALLOW_LIST={02:C0}
###############################################################################
# BAIL OUT value for P2P

View file

@ -64,8 +64,8 @@ PRESENCE_CHECK_ALGORITHM=5
NCI_HAL_MODULE="nfc_nci.st21nfc"
###############################################################################
# White list to be set at startup.
DEVICE_HOST_WHITE_LIST={02:C0}
# Allow list to be set at startup.
DEVICE_HOST_ALLOW_LIST={02:C0}
###############################################################################
# BAIL OUT value for P2P

View file

@ -60,8 +60,8 @@ PRESENCE_CHECK_ALGORITHM=5
NCI_HAL_MODULE="nfc_nci.st21nfc"
###############################################################################
# White list to be set at startup.
DEVICE_HOST_WHITE_LIST={02:C0}
# Allow list to be set at startup.
DEVICE_HOST_ALLOW_LIST={02:C0}
###############################################################################
# BAIL OUT value for P2P