From 660bbadb0642e424064dc64d14655193c92f1bfb Mon Sep 17 00:00:00 2001
From: Vachounet <vachounet@live.fr>
Date: Wed, 16 May 2018 13:53:45 +0200
Subject: [PATCH] sanders: build camera provider service

* And add hidl to manifest
* Also add memtrack service
---
 configs/manifest.xml | 15 ++++++++++++---
 device.mk            |  8 +++++++-
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/configs/manifest.xml b/configs/manifest.xml
index 1966ace..4fe82a8 100644
--- a/configs/manifest.xml
+++ b/configs/manifest.xml
@@ -491,6 +491,15 @@
             <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.camera.provider</name>
         <transport>hwbinder</transport>
@@ -501,11 +510,11 @@
         </interface>
     </hal>
     <hal format="hidl">
-        <name>android.hardware.biometrics.fingerprint</name>
+        <name>android.hardware.memtrack</name>
         <transport>hwbinder</transport>
-        <version>2.1</version>
+        <version>1.0</version>
         <interface>
-            <name>IBiometricsFingerprint</name>
+            <name>IMemtrack</name>
             <instance>default</instance>
         </interface>
     </hal>
diff --git a/device.mk b/device.mk
index 7fee56c..f72c37c 100644
--- a/device.mk
+++ b/device.mk
@@ -112,6 +112,9 @@ PRODUCT_PACKAGES += \
     camera.device@1.0-impl \
     camera.device@3.2-impl \
     android.hardware.camera.provider@2.4-impl \
+    android.hardware.camera.provider@2.4-service \
+    vendor.qti.hardware.camera.device@1.0 \
+    vendor.qti.hardware.camera.device@1.0_vendor \
     libshim_camera_hal \
     libshims_camera
 
@@ -148,13 +151,16 @@ PRODUCT_PACKAGES += \
     android.hardware.graphics.composer@2.1-service \
     android.hardware.graphics.mapper@2.0-impl \
     android.hardware.memtrack@1.0-impl \
+    android.hardware.memtrack@1.0-service \
     android.hardware.configstore@1.0-service \
     hwcomposer.msm8953 \
     memtrack.msm8953 \
     libgenlock \
     libtinyxml \
     libdisplayconfig \
-    libqdMetaData.system
+    libqdMetaData.system \
+    vendor.display.config@1.0 \
+    vendor.display.config@1.0_vendor
 
 PRODUCT_PACKAGES += android.hardware.media.omx