From 6847f031432e1ea86f09e5e99a333d8313c34196 Mon Sep 17 00:00:00 2001
From: roynatech2544 <whiteshell2544@naver.com>
Date: Sat, 4 Dec 2021 18:37:00 +0900
Subject: [PATCH] universal7885: override usb hal vintf for a10

* uses different versions
---
 universal7885-common/usb/typeb/Android.bp                       | 1 +
 .../android.hardware.usb@1.0-service.a10.xml}                   | 2 +-
 universal7885-common/usb/typec/Android.bp                       | 1 -
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename universal7885-common/usb/{typec/android.hardware.usb@1.1-service.exynos7885.xml => typeb/android.hardware.usb@1.0-service.a10.xml} (90%)

diff --git a/universal7885-common/usb/typeb/Android.bp b/universal7885-common/usb/typeb/Android.bp
index 4bdba1f..3eeb59c 100755
--- a/universal7885-common/usb/typeb/Android.bp
+++ b/universal7885-common/usb/typeb/Android.bp
@@ -17,6 +17,7 @@ cc_binary {
     name: "android.hardware.usb@1.0-service.a10",
     relative_install_path: "hw",
     init_rc: ["android.hardware.usb@1.0-service.a10.rc"],
+    vintf_fragments: ["android.hardware.usb@1.0-service.a10.xml"],
     srcs: ["service.cpp", "Usb.cpp"],
     shared_libs: [
         "libbase",
diff --git a/universal7885-common/usb/typec/android.hardware.usb@1.1-service.exynos7885.xml b/universal7885-common/usb/typeb/android.hardware.usb@1.0-service.a10.xml
similarity index 90%
rename from universal7885-common/usb/typec/android.hardware.usb@1.1-service.exynos7885.xml
rename to universal7885-common/usb/typeb/android.hardware.usb@1.0-service.a10.xml
index 540e067..f4cb657 100644
--- a/universal7885-common/usb/typec/android.hardware.usb@1.1-service.exynos7885.xml
+++ b/universal7885-common/usb/typeb/android.hardware.usb@1.0-service.a10.xml
@@ -2,7 +2,7 @@
     <hal format="hidl" override="true">
         <name>android.hardware.usb</name>
         <transport>hwbinder</transport>
-        <version>1.1</version>
+        <version>1.0</version>
         <interface>
             <name>IUsb</name>
             <instance>default</instance>
diff --git a/universal7885-common/usb/typec/Android.bp b/universal7885-common/usb/typec/Android.bp
index 2ebcfb7..addae3b 100644
--- a/universal7885-common/usb/typec/Android.bp
+++ b/universal7885-common/usb/typec/Android.bp
@@ -16,7 +16,6 @@ cc_binary {
     name: "android.hardware.usb@1.1-service.exynos7885",
     relative_install_path: "hw",
     init_rc: ["android.hardware.usb@1.1-service.exynos7885.rc"],
-    vintf_fragments: ["android.hardware.usb@1.1-service.exynos7885.xml"],
     srcs: ["service.cpp", "Usb.cpp"],
     cflags: [
         "-Wall",