Merge 2fd10c20bd0d85124a2a15549b343a3f09615b59 on remote branch

Change-Id: I6167ff1dc9250d6e7a5e70163a6ae5ce4e6b3c03

Android.mk

@@ -1,4 +1,12 @@
 # Android makefile for Fingerprint kernel modules
+FINGERPRINT_DLKM_ENABLED := true
+ifeq ($(TARGET_KERNEL_DLKM_DISABLE), true)
+       ifeq ($(TARGET_KERNEL_DLKM_FINGERPRINT_OVERRIDE), false)
+             FINGERPRINT_DLKM_ENABLED := false;
+       endif
+endif
+
+ifeq ($(FINGERPRINT_DLKM_ENABLED), true)
 
 ifeq ($(call is-board-platform-in-list,pineapple), true)
 ifneq (,$(filter arm aarch64 arm64, $(TARGET_ARCH)))
@@ -17,3 +25,4 @@ include $(DLKM_DIR)/Build_external_kernelmodule.mk
 
 endif
 endif
+endif

fingerprint_board.mk

@@ -1,3 +1,13 @@
+FINGERPRINT_DLKM_ENABLED := true
+ifeq ($(TARGET_KERNEL_DLKM_DISABLE), true)
+       ifeq ($(TARGET_KERNEL_DLKM_FINGERPRINT_OVERRIDE), false)
+             FINGERPRINT_DLKM_ENABLED := false;
+       endif
+endif
+
+ifeq ($(FINGERPRINT_DLKM_ENABLED), true)
 ifeq ($(call is-board-platform-in-list,pineapple), true)
 BOARD_VENDOR_KERNEL_MODULES += $(KERNEL_MODULES_OUT)/qbt_handler.ko
 endif
+
+endif