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

Change-Id: Ie8b564606e5c8e99d76bcc73d8fa020001b75337
---
 BoardConfigCommon.mk | 3 ---
 klte.mk              | 7 +------
 manifest.xml         | 9 ---------
 3 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index d70f818..2b059fd 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -32,9 +32,6 @@ BOARD_HAVE_SAMSUNG_BLUETOOTH := true
 # Bootloader
 TARGET_BOOTLOADER_BOARD_NAME := MSM8974
 
-# Camera
-USE_DEVICE_SPECIFIC_CAMERA := true
-
 # Extended Filesystem Support
 TARGET_EXFAT_DRIVER := sdfat
 
diff --git a/klte.mk b/klte.mk
index 4826d74..5103a23 100644
--- a/klte.mk
+++ b/klte.mk
@@ -34,12 +34,7 @@ PRODUCT_COPY_FILES += \
 
 # Camera
 PRODUCT_PACKAGES += \
-    android.hardware.camera.provider@2.4-impl \
-    camera.device@1.0-impl \
-    camera.msm8974 \
-    libshim_camera \
-    libxml2 \
-    Snap
+    libshim_camera
 
 # Device uses high-density artwork where available
 PRODUCT_AAPT_CONFIG := normal
diff --git a/manifest.xml b/manifest.xml
index 3745b47..f64ed72 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -1,13 +1,4 @@
 <manifest version="1.0" type="device">
-    <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.light</name>
         <transport arch="32">passthrough</transport>