From c008f4449b22113f5cafb242d5851dd10d63db05 Mon Sep 17 00:00:00 2001
From: yihsiangpeng <yihsiangpeng@google.com>
Date: Mon, 29 Mar 2021 12:11:12 +0800
Subject: [PATCH] use vintf_fragments instead of adding it to device-specific
 manifests

Bug: 183536544
Signed-off-by: yihsiangpeng <yihsiangpeng@google.com>
Change-Id: I7299d62a122fb56974b09846746a848b89ffa641
---
 compatibility_matrix.xml |  8 --------
 manifest-gralloc3.xml    | 16 ----------------
 manifest.xml             | 16 ----------------
 manifest_64-gralloc3.xml | 16 ----------------
 manifest_64.xml          | 16 ----------------
 5 files changed, 72 deletions(-)

diff --git a/compatibility_matrix.xml b/compatibility_matrix.xml
index ed291528..264e8547 100644
--- a/compatibility_matrix.xml
+++ b/compatibility_matrix.xml
@@ -78,14 +78,6 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl" optional="true">
-        <name>vendor.google.wireless_charger</name>
-        <version>1.3</version>
-        <interface>
-            <name>IWirelessCharger</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <vndk>
         <version>0.0.0</version>
     </vndk>
diff --git a/manifest-gralloc3.xml b/manifest-gralloc3.xml
index 4539a4b0..6e86082a 100644
--- a/manifest-gralloc3.xml
+++ b/manifest-gralloc3.xml
@@ -220,21 +220,5 @@
            <instance>default</instance>
        </interface>
     </hal>
-    <hal format="hidl">
-      <name>vendor.google.wireless_charger</name>
-      <transport>hwbinder</transport>
-      <version>1.3</version>
-      <interface>
-        <name>IWirelessCharger</name>
-        <instance>default</instance>
-      </interface>
-    </hal>
-    <hal format="aidl">
-      <name>com.google.input</name>
-      <interface>
-        <name>ITouchContextService</name>
-        <instance>default</instance>
-      </interface>
-    </hal>
     <kernel target-level="6"/>
 </manifest>
diff --git a/manifest.xml b/manifest.xml
index d5f32582..c8bcedcd 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -220,21 +220,5 @@
            <instance>default</instance>
        </interface>
     </hal>
-    <hal format="hidl">
-      <name>vendor.google.wireless_charger</name>
-      <transport>hwbinder</transport>
-      <version>1.3</version>
-      <interface>
-        <name>IWirelessCharger</name>
-        <instance>default</instance>
-      </interface>
-    </hal>
-    <hal format="aidl">
-      <name>com.google.input</name>
-      <interface>
-        <name>ITouchContextService</name>
-        <instance>default</instance>
-      </interface>
-    </hal>
     <kernel target-level="6"/>
 </manifest>
diff --git a/manifest_64-gralloc3.xml b/manifest_64-gralloc3.xml
index 7056de41..5a4cac7c 100644
--- a/manifest_64-gralloc3.xml
+++ b/manifest_64-gralloc3.xml
@@ -209,21 +209,5 @@
            <instance>default</instance>
        </interface>
     </hal>
-    <hal format="hidl">
-      <name>vendor.google.wireless_charger</name>
-      <transport>hwbinder</transport>
-      <version>1.3</version>
-      <interface>
-        <name>IWirelessCharger</name>
-        <instance>default</instance>
-      </interface>
-    </hal>
-    <hal format="aidl">
-      <name>com.google.input</name>
-      <interface>
-        <name>ITouchContextService</name>
-        <instance>default</instance>
-      </interface>
-    </hal>
     <kernel target-level="6"/>
 </manifest>
diff --git a/manifest_64.xml b/manifest_64.xml
index a0244dc7..3ea065ee 100644
--- a/manifest_64.xml
+++ b/manifest_64.xml
@@ -209,21 +209,5 @@
            <instance>default</instance>
        </interface>
     </hal>
-    <hal format="hidl">
-      <name>vendor.google.wireless_charger</name>
-      <transport>hwbinder</transport>
-      <version>1.3</version>
-      <interface>
-        <name>IWirelessCharger</name>
-        <instance>default</instance>
-      </interface>
-    </hal>
-    <hal format="aidl">
-      <name>com.google.input</name>
-      <interface>
-        <name>ITouchContextService</name>
-        <instance>default</instance>
-      </interface>
-    </hal>
     <kernel target-level="6"/>
 </manifest>