Merge "NFC: Driver Compilation fix" into nfc-driver.lnx.14.0

Android.mk

@@ -1,6 +1,7 @@
 # Android makefile for nfc kernel modules
 
 # Path to DLKM make scripts
+ifeq ($(strip $(NFC_DLKM_ENABLED)),true)
 DLKM_DIR          :=  $(TOP)/device/qcom/common/dlkm
 
 LOCAL_PATH        := $(call my-dir)
@@ -19,19 +20,6 @@ LOCAL_MODULE      := nxp-nci.ko
 LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT)
 LOCAL_SRC_FILES   := $(wildcard $(LOCAL_PATH)/**/*) $(wildcard $(LOCAL_PATH)/*)
 
-NFC_DLKM_ENABLED := false
-
-########## Check and set local DLKM flag based on system-wide global flags ##########
-ifeq ($(TARGET_KERNEL_DLKM_DISABLE), true)
-  ifeq ($(TARGET_KERNEL_DLKM_NFC_OVERRIDE), true)
-    NFC_DLKM_ENABLED := true
-  endif
-else
-  NFC_DLKM_ENABLED := true
-endif
-
-########## Build kernel module based on local DLKM flag status ##########
-ifeq ($(NFC_DLKM_ENABLED), true)
-  LOCAL_MODULE_DDK_BUILD := true
-  include $(DLKM_DIR)/Build_external_kernelmodule.mk
+LOCAL_MODULE_DDK_BUILD := true
+include $(DLKM_DIR)/Build_external_kernelmodule.mk
 endif

nfc_kernel_dlkm_vendor_board.mk

@@ -1,6 +1,20 @@
 # Build NFC kernel driver
+NFC_DLKM_ENABLED := false
+
+########## Check and set local DLKM flag based on system-wide global flags ##########
+ifeq ($(TARGET_KERNEL_DLKM_DISABLE), true)
+  ifeq ($(TARGET_KERNEL_DLKM_NFC_OVERRIDE), true)
+    NFC_DLKM_ENABLED := true
+  endif
+else
+  NFC_DLKM_ENABLED := true
+endif
+
+########## Build kernel module based on local DLKM flag status ##########
+ifeq ($(NFC_DLKM_ENABLED), true)
 ifeq ($(call is-board-platform-in-list, pineapple blair),true)
-BOARD_VENDOR_KERNEL_MODULES += $(KERNEL_MODULES_OUT)/nxp-nci.ko
+  BOARD_VENDOR_KERNEL_MODULES += $(KERNEL_MODULES_OUT)/nxp-nci.ko
+endif
 endif
 
 ifeq ($(call is-board-platform-in-list, blair),true)