Fix NXP_CHIP_TYPE and compile errors
NXP_CHIP_TYPE should be set in the device.mk for respective device and
not hard-coded. Fix compile time errors for the same.
Bug: 64264750
Test: HCE-F Emulator/Reader CTS tests
Change-Id: I6dc55d319784be0bc2b54d4801ac1f1695ebbe7e
(cherry picked from commit 6f1cd4d771e6670fb8b99eca41d171ba7f95adf2)
(cherry picked from commit 615a7be8d8d481302071e9d2faeb278c20fcf42b)
diff --git a/halimpl/pn54x/Android.mk b/halimpl/pn54x/Android.mk
index cfbb9ce..c5a0030 100644
--- a/halimpl/pn54x/Android.mk
+++ b/halimpl/pn54x/Android.mk
@@ -35,9 +35,6 @@
D_CFLAGS += -DPN553=4
endif
-#### Select the CHIP ####
-NXP_CHIP_TYPE := $PN553
-
ifeq ($(NXP_CHIP_TYPE),$(PN547C2))
D_CFLAGS += -DNFC_NXP_CHIP_TYPE=PN547C2
else ifeq ($(NXP_CHIP_TYPE),$(PN548C2))
