From 2c84b12f811d64c9e2f058e28625754948972129 Mon Sep 17 00:00:00 2001
From: Chih-Wei Huang <cwhuang@linux.org.tw>
Date: Fri, 10 Nov 2017 14:11:52 +0800
Subject: [PATCH] Make android.hardware.graphics.allocator passthrough

The gralloc.drm doesn't work in binderized mode.
Set its HIDL HAL to passthrough mode temporarily.

Note this violates the HAL type required by Android 8.0.
It should be fixed later.
---
 BoardConfig.mk |  1 +
 CleanSpec.mk   |  1 +
 manifest.xml   | 18 ++++++++++++++++++
 treble.mk      |  1 -
 4 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 CleanSpec.mk

diff --git a/BoardConfig.mk b/BoardConfig.mk
index ffc7138..27b5af9 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -63,6 +63,7 @@ USE_INTEL_OMX_COMPONENTS := true
 USE_OPENGL_RENDERER := true
 NUM_FRAMEBUFFER_SURFACE_BUFFERS ?= 3
 BOARD_USES_DRM_HWCOMPOSER ?= true
+SF_START_GRAPHICS_ALLOCATOR_SERVICE := true
 
 USE_CAMERA_STUB ?= false
 
diff --git a/CleanSpec.mk b/CleanSpec.mk
new file mode 100644
index 0000000..7a60b7b
--- /dev/null
+++ b/CleanSpec.mk
@@ -0,0 +1 @@
+$(call add-clean-step, rm -f $(TARGET_OUT_VENDOR)/*/*/android.hardware.graphics.allocator@2.0-service*)
diff --git a/manifest.xml b/manifest.xml
index ede994f..ee0340a 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -36,6 +36,24 @@
         </interface>
     </hal>
     <hal format="hidl">
+        <name>android.hardware.graphics.allocator</name>
+        <transport arch="32+64">passthrough</transport>
+        <version>2.0</version>
+        <interface>
+            <name>IAllocator</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl">
+        <name>android.hardware.graphics.mapper</name>
+        <transport arch="32+64">passthrough</transport>
+        <version>2.0</version>
+        <interface>
+            <name>IMapper</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl">
         <name>android.hardware.media.omx</name>
         <transport>hwbinder</transport>
         <version>1.0</version>
diff --git a/treble.mk b/treble.mk
index 7d01f37..bf132e7 100644
--- a/treble.mk
+++ b/treble.mk
@@ -2,7 +2,6 @@
 PRODUCT_PACKAGES += \
     android.hardware.graphics.mapper@2.0-impl \
     android.hardware.graphics.allocator@2.0-impl \
-    android.hardware.graphics.allocator@2.0-service
 
 # HWComposer HAL
 PRODUCT_PACKAGES += \
-- 
2.11.0