From f999621c0c1539759e7aecc9578d129218bb9082 Mon Sep 17 00:00:00 2001
From: Paul Keith <javelinanddart@gmail.com>
Date: Fri, 29 Dec 2017 00:54:31 +0100
Subject: [PATCH] klte-common: Split out fingerprint support

* kltesprsports doesn't have a fingerprint scanner, so variants
  supporting one can include fingerprint/board.mk in BoardConfig.mk,
  and fingerprint/product.mk in device.mk to avoid polluting the
  kltesprsports build with fingerprint-related items.

Change-Id: I2fb1652d771740d05c3ec083054960fbe326bea4
---
 fingerprint/board.mk     |  2 ++
 fingerprint/manifest.xml | 11 +++++++++++
 fingerprint/product.mk   |  7 +++++++
 klte.mk                  |  6 ------
 manifest.xml             |  9 ---------
 5 files changed, 20 insertions(+), 15 deletions(-)
 create mode 100644 fingerprint/board.mk
 create mode 100644 fingerprint/manifest.xml
 create mode 100644 fingerprint/product.mk

diff --git a/fingerprint/board.mk b/fingerprint/board.mk
new file mode 100644
index 0000000..c981627
--- /dev/null
+++ b/fingerprint/board.mk
@@ -0,0 +1,2 @@
+# Fingerprint
+DEVICE_MANIFEST_FILE += $(COMMON_PATH)/fingerprint/manifest.xml
diff --git a/fingerprint/manifest.xml b/fingerprint/manifest.xml
new file mode 100644
index 0000000..115dd7b
--- /dev/null
+++ b/fingerprint/manifest.xml
@@ -0,0 +1,11 @@
+<manifest version="1.0" type="device">
+    <hal format="hidl">
+        <name>android.hardware.biometrics.fingerprint</name>
+        <transport>hwbinder</transport>
+        <version>2.1</version>
+        <interface>
+            <name>IBiometricsFingerprint</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+</manifest>
diff --git a/fingerprint/product.mk b/fingerprint/product.mk
new file mode 100644
index 0000000..1de7f77
--- /dev/null
+++ b/fingerprint/product.mk
@@ -0,0 +1,7 @@
+# Fingerprint
+PRODUCT_PACKAGES += \
+    android.hardware.biometrics.fingerprint@2.1-service \
+    fingerprint.msm8974
+
+PRODUCT_COPY_FILES += \
+    frameworks/native/data/etc/android.hardware.fingerprint.xml:system/etc/permissions/android.hardware.fingerprint.xml
diff --git a/klte.mk b/klte.mk
index e48571e..9c3ef84 100644
--- a/klte.mk
+++ b/klte.mk
@@ -62,11 +62,6 @@ PRODUCT_AAPT_PREF_CONFIG := xxhdpi
 PRODUCT_PACKAGES += \
     SamsungDoze
 
-# Fingerprint
-PRODUCT_PACKAGES += \
-    android.hardware.biometrics.fingerprint@2.1-service \
-    fingerprint.msm8974
-
 # FlipFlap
 PRODUCT_PACKAGES += \
     FlipFlap
@@ -123,7 +118,6 @@ PRODUCT_PACKAGES += \
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.audio.low_latency.xml:system/etc/permissions/android.hardware.audio.low_latency.xml \
     frameworks/native/data/etc/android.hardware.consumerir.xml:system/etc/permissions/android.hardware.consumerir.xml \
-    frameworks/native/data/etc/android.hardware.fingerprint.xml:system/etc/permissions/android.hardware.fingerprint.xml \
     frameworks/native/data/etc/android.hardware.nfc.xml:system/etc/permissions/android.hardware.nfc.xml \
     frameworks/native/data/etc/android.hardware.nfc.hce.xml:system/etc/permissions/android.hardware.nfc.hce.xml \
     frameworks/native/data/etc/android.hardware.sensor.stepcounter.xml:system/etc/permissions/android.hardware.sensor.stepcounter.xml \
diff --git a/manifest.xml b/manifest.xml
index 85e6481..897e84d 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -17,15 +17,6 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl">
-        <name>android.hardware.biometrics.fingerprint</name>
-        <transport>hwbinder</transport>
-        <version>2.1</version>
-        <interface>
-            <name>IBiometricsFingerprint</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <hal format="hidl">
         <name>android.hardware.bluetooth</name>
         <transport arch="32">passthrough</transport>