universal8895: build configstore HIDL HAL

Change-Id: If2d406bff9a2d8ba57c2184e0075ea99204fb141

diff --git a/device-common.mk b/device-common.mk
index 88460ea336218fa9c3cb3da14b05a7d34057fa23..1e26d6d33f690b186adeea8fe25b6836c547c831 100644 (file)
--- a/device-common.mk
+++ b/device-common.mk
@@ -29,6 +29,19 @@ PRODUCT_AAPT_PREF_CONFIG := xxxhdpi
 # A list of dpis to select prebuilt apk, in precedence order.
 PRODUCT_AAPT_PREBUILT_DPI := xxxhdpi xxhdpi xhdpi hdpi
 
+<<<<<<< HEAD
+=======
+# Camera
+PRODUCT_PACKAGES += \
+    android.hardware.camera.provider@2.4-impl-legacy \
+    android.hardware.camera.provider@2.4-service
+
+# Configstore
+PRODUCT_PACKAGES += \
+    android.hardware.configstore@1.0-impl \
+    android.hardware.configstore@1.0-service
+
+>>>>>>> a79c312... universal8895: build configstore HIDL HAL
 # Permissions
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.audio.low_latency.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.audio.low_latency.xml \