From ba206cfef1d9383d6462e5d21b3c02bebb2de3f5 Mon Sep 17 00:00:00 2001
From: Mark Chang <changmark@google.com>
Date: Wed, 31 Jan 2024 12:49:48 +0000
Subject: [PATCH] Move manifest entries to gs-common.

Bug: 322914403
Bug: 324214410
Test: build succeeds on all devices, failing tests pass.
Change-Id: I0711a1d8cfd02ccd168f57ac16feee2a8e0ee777
Signed-off-by: Mark Chang <changmark@google.com>
---
 device.mk                           | 3 +++
 device_framework_matrix_product.xml | 8 --------
 manifest-gralloc3.xml               | 8 --------
 manifest.xml                        | 8 --------
 4 files changed, 3 insertions(+), 24 deletions(-)

diff --git a/device.mk b/device.mk
index ec4d08dd..c728ca9a 100644
--- a/device.mk
+++ b/device.mk
@@ -1159,3 +1159,6 @@ include hardware/google/pixel/HardwareInfo/HardwareInfo.mk
 
 # UFS: the script is used to select the corresponding firmware to run FFU.
 PRODUCT_PACKAGES += ufs_firmware_update.sh
+
+# Touch service
+include device/google/gs-common/touch/twoshay/aidl_gs101.mk
diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml
index 9d626258..b3d37877 100644
--- a/device_framework_matrix_product.xml
+++ b/device_framework_matrix_product.xml
@@ -84,14 +84,6 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="aidl" optional="true">
-        <name>com.google.input</name>
-        <version>2</version>
-        <interface>
-            <name>ITouchContextService</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <hal format="aidl" optional="true">
         <name>hardware.qorvo.uwb</name>
         <version>2</version>
diff --git a/manifest-gralloc3.xml b/manifest-gralloc3.xml
index cd405200..5cce8cf3 100644
--- a/manifest-gralloc3.xml
+++ b/manifest-gralloc3.xml
@@ -86,14 +86,6 @@
        <transport>hwbinder</transport>
        <fqname>@1.3::IDevice/google-edgetpu</fqname>
     </hal>
-    <hal format="aidl">
-        <name>com.google.input</name>
-        <version>2</version>
-        <interface>
-            <name>ITouchContextService</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <hal format="aidl">
         <name>vendor.google.google_battery</name>
         <version>2-3</version>
diff --git a/manifest.xml b/manifest.xml
index a5cf98dc..34b0326d 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -12,12 +12,4 @@
         <name>android.hardware.boot</name>
         <fqname>IBootControl/default</fqname>
     </hal>
-    <hal format="aidl">
-        <name>com.google.input</name>
-        <version>2</version>
-        <interface>
-            <name>ITouchContextService</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
 </manifest>