From 8e7f2eebf93d7170b78c2a19f35cd6ab12c20ce1 Mon Sep 17 00:00:00 2001
From: Deokgyu Yang <secugyu@gmail.com>
Date: Mon, 24 May 2021 22:14:09 +0900
Subject: [PATCH] gts3l: usb: Import USB HAL and it contains vinf itself

The USB HAL is from LineageOS/samsung_gts4lv-common, lineage-18.1

Signed-off-by: Deokgyu Yang <secugyu@gmail.com>
Change-Id: I4800a5ccffcab78a1ac2e5605c6df37ad785b763
---
 manifest.xml                                   |  9 ---------
 usb/Android.bp                                 |  2 +-
 usb/android.hardware.usb@1.1-service.gts3l.rc  |  2 ++
 usb/android.hardware.usb@1.1-service.gts3l.xml | 11 +++++++++++
 4 files changed, 14 insertions(+), 10 deletions(-)
 create mode 100644 usb/android.hardware.usb@1.1-service.gts3l.xml

diff --git a/manifest.xml b/manifest.xml
index ad1d3d3..cbb374d 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -258,15 +258,6 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl">
-        <name>android.hardware.usb</name>
-        <transport>hwbinder</transport>
-        <version>1.1</version>
-        <interface>
-            <name>IUsb</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <hal format="hidl">
         <name>android.hardware.vibrator</name>
         <transport>hwbinder</transport>
diff --git a/usb/Android.bp b/usb/Android.bp
index 0bbce2b..c8089cb 100644
--- a/usb/Android.bp
+++ b/usb/Android.bp
@@ -16,6 +16,7 @@ cc_binary {
     name: "android.hardware.usb@1.1-service.gts3l",
     relative_install_path: "hw",
     init_rc: ["android.hardware.usb@1.1-service.gts3l.rc"],
+    vintf_fragments: ["android.hardware.usb@1.1-service.gts3l.xml"],
     srcs: ["service.cpp", "Usb.cpp"],
     cflags: [
         "-Wall",
@@ -24,7 +25,6 @@ cc_binary {
     shared_libs: [
         "libbase",
         "libhidlbase",
-        "libhidltransport",
         "liblog",
         "libutils",
         "libhardware",
diff --git a/usb/android.hardware.usb@1.1-service.gts3l.rc b/usb/android.hardware.usb@1.1-service.gts3l.rc
index 8135fc7..0710548 100644
--- a/usb/android.hardware.usb@1.1-service.gts3l.rc
+++ b/usb/android.hardware.usb@1.1-service.gts3l.rc
@@ -1,4 +1,6 @@
 service vendor.usb-hal-1-1 /vendor/bin/hw/android.hardware.usb@1.1-service.gts3l
+    interface android.hardware.usb@1.1::IUsb default
+    interface android.hardware.usb@1.0::IUsb default
     class hal
     user root
     group root system
diff --git a/usb/android.hardware.usb@1.1-service.gts3l.xml b/usb/android.hardware.usb@1.1-service.gts3l.xml
new file mode 100644
index 0000000..81f75e1
--- /dev/null
+++ b/usb/android.hardware.usb@1.1-service.gts3l.xml
@@ -0,0 +1,11 @@
+<manifest version="1.0" type="device">
+    <hal format="hidl">
+        <name>android.hardware.usb</name>
+        <transport>hwbinder</transport>
+        <version>1.1</version>
+        <interface>
+            <name>IUsb</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+</manifest>