commit 5ec7f7b23c4326832fb7bbc622f50dbab403f9c5
author Satish Kumar Singh <ssing@codeaurora.org> Fri Feb 21 14:14:02 2014 -0800
committer Houston Hoffman <hhoffman@codeaurora.org> Mon Mar 10 01:58:55 2014 -0700
tree 4d7c248a5f699ee7ddec30a051c08dd8eb700cc1
parent 8946775a56aafe0438dcbc91bbc37bca3ba7241f

msm8974: enable one build for NFC DTA and non DTA

one build for DTA and non DTA based NFC.

Change-Id: Ieaa041d14fcae49755681422048b8febef52c31c

msm8974.mk

diff --git a/msm8974.mk b/msm8974.mk
index 23bd8ca..d1f0929 100644
--- a/msm8974.mk
+++ b/msm8974.mk
@@ -1,5 +1,5 @@
 TARGET_USES_QCOM_BSP := true
-BOARD_HAVE_QCA_NFC := true
+TARGET_USES_QCA_NFC := true
 
 ifeq ($(TARGET_USES_QCOM_BSP), true)
 # Add QC Video Enhancements flag
@@ -82,8 +82,21 @@
 PRODUCT_COPY_FILES += \
     device/qcom/msm8974/whitelist_appops.xml:system/etc/whitelist_appops.xml
 
-ifeq ($(BOARD_HAVE_QCA_NFC),true)
+
 # NFC packages
+ifeq ($(TARGET_USES_QCA_NFC),true)
+NFC_D := true
+
+ifeq ($(NFC_D), true)
+    PRODUCT_PACKAGES += \
+        libnfcD-nci \
+        libnfcD_nci_jni \
+        nfc_nci.msm8974 \
+        NfcDNci \
+        Tag \
+        com.android.nfc_extras \
+        com.android.nfc.helper
+else
 PRODUCT_PACKAGES += \
     libnfc-nci \
     libnfc_nci_jni \
@@ -91,6 +104,7 @@
     NfcNci \
     Tag \
     com.android.nfc_extras
+endif
 
 # file that declares the MIFARE NFC constant
 # Commands to migrate prefs from com.android.nfc3 to com.android.nfc