commit 634b0e92547bde2b036f2276973d7b7bce03044c
author Martijn Coenen <maco@google.com> Tue Sep 06 16:05:25 2016 +0200
committer Rohit Rangwani <rrangwan@codeaurora.org> Fri Apr 07 19:42:06 2017 +0530
tree c1bcf6b261a4eec0723d46b0ced710ae2b5031a6
parent d6826563cff2053356cf3ed81aa57e329a451b00

Switch to using the NFC HIDL HAL.

The framework communicates with the NFC via libnfc-nci.  This patch
converts libnfc-nci to talk to the NFC via the HIDL NFC HAL
(android.hardware.nfc@1.0) defined in hardware/interfaces/nfc/1.0

b/31688271
related to b/31748996

Test: pass

Change-Id: Ib8ebcfb5f3998bba025e9559ab52e1f9eacc4df6
(cherry picked from commit e9e48e5c716096c2303b9b3f3b9ff44fd37caeec)

Android.mk

diff --git a/Android.mk b/Android.mk
index 4652d0e..1627423 100644
--- a/Android.mk
+++ b/Android.mk
@@ -108,7 +108,11 @@
     $(LOCAL_PATH)/$(NFC)/int \
     $(LOCAL_PATH)/src/hal/include \
     $(LOCAL_PATH)/src/hal/int \
-    $(LOCAL_PATH)/$(HALIMPL)/include
+    $(LOCAL_PATH)/$(HALIMPL)/include \
+    system/libhwbinder/include
+
+# Treble configuration
+LOCAL_SHARED_LIBRARIES += libhidl libhwbinder libutils android.hardware.nfc@1.0
 LOCAL_SRC_FILES := \
     $(call all-c-files-under, $(NFA)/ce $(NFA)/dm $(NFA)/ee) \
     $(call all-c-files-under, $(NFA)/hci $(NFA)/int $(NFA)/p2p $(NFA)/rw $(NFA)/sys) \