universal8895: build graphic packages

Change-Id: Ie4d693823e8540546666c5f1144acae8e85b0603

diff --git a/device-common.mk b/device-common.mk
index 1e26d6d33f690b186adeea8fe25b6836c547c831..32e3b8eb194d8efd663e4ade389cfd4e8dc8939c 100644 (file)
--- a/device-common.mk
+++ b/device-common.mk
@@ -29,19 +29,18 @@ 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
+# Graphics
+PRODUCT_PACKAGES += \
+    android.hardware.graphics.allocator@2.0-impl \
+    android.hardware.graphics.allocator@2.0-service \
+    android.hardware.graphics.composer@2.2-service \
+    android.hardware.graphics.mapper@2.0-impl
+
 # 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 \