Enable passthrough graphics composer

Bug: 34095715
Test: YouTube, Play Movies
Change-Id: Ie7608754b3b4e426d65f8cfb4f0d2bd06784be34
diff --git a/BoardConfig.mk b/BoardConfig.mk
index 4c61ccb..5908cac 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -81,9 +81,7 @@
 TARGET_SUPPORT_HDMI_PRIMARY := true
 BOARD_USES_LIBDRM := true
 
-# Use SurfaceFlinger HWC 2On1 Adaptor
 TARGET_USES_HWC2 := true
-TARGET_USES_HWC2ON1ADAPTER := true
 SF_START_GRAPHICS_ALLOCATOR_SERVICE := true
 VSYNC_EVENT_PHASE_OFFSET_NS := 2000000
 SF_VSYNC_EVENT_PHASE_OFFSET_NS := 6000000
diff --git a/device.mk b/device.mk
index a40e4d0..7972174 100644
--- a/device.mk
+++ b/device.mk
@@ -139,6 +139,7 @@
 
 PRODUCT_PACKAGES += \
     android.hardware.graphics.allocator@2.0-impl \
+    android.hardware.graphics.composer@2.1-impl \
     android.hardware.graphics.mapper@2.0-impl
 
 # Video
diff --git a/manifest.xml b/manifest.xml
index 9fab3aa..a4e8812 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -10,6 +10,15 @@
         </interface>
     </hal>
     <hal format="hidl">
+        <name>android.hardware.graphics.composer</name>
+        <transport arch="32+64">passthrough</transport>
+        <version>2.1</version>
+        <interface>
+            <name>IComposer</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl">
         <name>android.hardware.graphics.mapper</name>
         <transport arch="32+64">passthrough</transport>
         <impl level="generic"></impl>