From 68ef2d47da2bb25f1b2495aff0a0e290afdb9094 Mon Sep 17 00:00:00 2001
From: "Kevin F. Haggerty" <haggertk@lineageos.org>
Date: Sat, 15 Sep 2018 10:26:23 -0600
Subject: [PATCH] msm8974-common: Commonize camera packages and manifest
 entries

Change-Id: I348680ccf6541b13289d1470c7e91111be4992c0
---
 manifest.xml | 9 +++++++++
 msm8974.mk   | 8 ++++++++
 2 files changed, 17 insertions(+)

diff --git a/manifest.xml b/manifest.xml
index fd7b702..f26642d 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -26,6 +26,15 @@
             <instance>default</instance>
         </interface>
     </hal>
+    <hal format="hidl">
+        <name>android.hardware.camera.provider</name>
+        <transport arch="32">passthrough</transport>
+        <version>2.4</version>
+        <interface>
+            <name>ICameraProvider</name>
+            <instance>legacy/0</instance>
+        </interface>
+    </hal>
     <hal format="hidl">
         <name>android.hardware.configstore</name>
         <transport>hwbinder</transport>
diff --git a/msm8974.mk b/msm8974.mk
index dd277ca..96a7f45 100644
--- a/msm8974.mk
+++ b/msm8974.mk
@@ -97,6 +97,14 @@ PRODUCT_PACKAGES += \
     hwcomposer.msm8974 \
     memtrack.msm8974
 
+# Camera
+PRODUCT_PACKAGES += \
+    android.hardware.camera.provider@2.4-impl \
+    camera.device@1.0-impl \
+    camera.msm8974 \
+    libxml2 \
+    Snap
+
 # DRM
 PRODUCT_PACKAGES += \
     android.hardware.drm@1.0-impl \