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

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

diff --git a/device.mk b/device.mk
index a8ce9527..ea89db65 100644
--- a/device.mk
+++ b/device.mk
@@ -1117,3 +1117,6 @@ PRODUCT_VENDOR_PROPERTIES += ro.crypto.metadata_init_delete_all_keys.enabled=tru
 
 # Hardware Info Collection
 include hardware/google/pixel/HardwareInfo/HardwareInfo.mk
+
+# 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 280c120f..e365bbb0 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.xml b/manifest.xml
index fdc85f37..02a3b593 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -34,13 +34,5 @@
         <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>
     <kernel target-level="6"/>
 </manifest>
diff --git a/manifest_64.xml b/manifest_64.xml
index 5f6d83ae..d8d7b111 100644
--- a/manifest_64.xml
+++ b/manifest_64.xml
@@ -26,13 +26,5 @@
        <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>
     <kernel target-level="6"/>
 </manifest>