From 82c0ce8c5e591c7a9f51a2a34be5baeb9f281f39 Mon Sep 17 00:00:00 2001
From: Chih-Wei Huang <cwhuang@linux.org.tw>
Date: Fri, 10 Nov 2017 13:35:32 +0800
Subject: [PATCH] Add device manifest file

The following HIDL HALs are added:

* android.hardware.configstore@1.0 (binderized)
* android.hardware.dumpstate@1.0 (binderized)
* android.hardware.media.omx@1.0 (binderized)
* android.hardware.renderscript@1.0 (passthrough)
* android.hardware.usb@1.0 (binderized)
---
 BoardConfig.mk |  2 ++
 manifest.xml   | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
 treble.mk      | 14 ++++++++++++++
 3 files changed, 67 insertions(+)
 create mode 100644 manifest.xml

diff --git a/BoardConfig.mk b/BoardConfig.mk
index f7f618b..ffc7138 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -85,3 +85,5 @@ TARGET_KERNEL_DIFFCONFIG := device/generic/common/selinux_diffconfig
 COMPATIBILITY_ENHANCEMENT_PACKAGE := true
 PRC_COMPATIBILITY_PACKAGE := true
 ZIP_OPTIMIZATION_NO_INTEGRITY := true
+
+DEVICE_MANIFEST_FILE := device/generic/common/manifest.xml
diff --git a/manifest.xml b/manifest.xml
new file mode 100644
index 0000000..c2e87d6
--- /dev/null
+++ b/manifest.xml
@@ -0,0 +1,51 @@
+<manifest version="1.0" type="device">
+    <hal format="hidl">
+        <name>android.hardware.configstore</name>
+        <transport>hwbinder</transport>
+        <version>1.0</version>
+        <interface>
+            <name>ISurfaceFlingerConfigs</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl">
+        <name>android.hardware.dumpstate</name>
+        <transport>hwbinder</transport>
+        <version>1.0</version>
+        <interface>
+            <name>IDumpstateDevice</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl">
+        <name>android.hardware.media.omx</name>
+        <transport>hwbinder</transport>
+        <version>1.0</version>
+        <interface>
+            <name>IOmx</name>
+            <instance>default</instance>
+        </interface>
+        <interface>
+            <name>IOmxStore</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl">
+        <name>android.hardware.renderscript</name>
+        <transport arch="32+64">passthrough</transport>
+        <version>1.0</version>
+        <interface>
+            <name>IDevice</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl">
+        <name>android.hardware.usb</name>
+        <transport>hwbinder</transport>
+        <version>1.0</version>
+        <interface>
+            <name>IUsb</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+</manifest>
diff --git a/treble.mk b/treble.mk
index d863c59..67d06c1 100644
--- a/treble.mk
+++ b/treble.mk
@@ -25,6 +25,11 @@ PRODUCT_PACKAGES += \
     android.hardware.camera.provider@2.4-impl \
 #   android.hardware.camera.provider@2.4-service
 
+# DumpState HAL
+PRODUCT_PACKAGES += \
+    android.hardware.dumpstate@1.0-impl \
+    android.hardware.dumpstate@1.0-service
+
 # Gatekeeper HAL
 #PRODUCT_PACKAGES += \
     android.hardware.gatekeeper@1.0-impl
@@ -49,10 +54,19 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
     android.hardware.power@1.0-impl
 
+# RenderScript HAL
+PRODUCT_PACKAGES += \
+    android.hardware.renderscript@1.0-impl
+
 # Sensors HAL
 PRODUCT_PACKAGES += \
     android.hardware.sensors@1.0-impl
 
+# USB HAL
+PRODUCT_PACKAGES += \
+    android.hardware.usb@1.0-impl \
+    android.hardware.usb@1.0-service
+
 # Wifi HAL
 #PRODUCT_PACKAGES += \
     android.hardware.wifi@1.0-service
-- 
2.11.0