use vintf_fragments instead of adding it to device-specific manifests
Bug: 183536544
Signed-off-by: yihsiangpeng <yihsiangpeng@google.com>
Change-Id: I7299d62a122fb56974b09846746a848b89ffa641
diff --git a/compatibility_matrix.xml b/compatibility_matrix.xml
index ed29152..264e854 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 4539a4b..6e86082 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 d5f3258..c8bcedc 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 7056de4..5a4cac7 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 a0244dc..3ea065e 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>