From 111ec55cd1f1dc67949761934f6c700b55c89511 Mon Sep 17 00:00:00 2001
From: Renato Grottesi <otaner@google.com>
Date: Thu, 13 Jul 2023 18:43:48 +0000
Subject: [PATCH 1/2] Remove settings for old ArmNN HIDL backend

Compile ArmNN shim over the support library.

Remove SELinux permissions and settings for the old HIDL backend.
The AIDL settings will be in the gs-common folder.

Test: Local run of CtsNNAPITestCases
Test: Local run of VtsHalNeuralnetworksTargetTest
Test: Local run of MLTS Benchmark
Bug: 283724775
Change-Id: Icfc07d6d48ae9adedefa3f040be0c18ea6b0c4e1
---
 manifest.xml | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/manifest.xml b/manifest.xml
index 6068981..56f489c 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -98,16 +98,6 @@
         <transport>hwbinder</transport>
         <fqname>@1.2::IBootControl/default</fqname>
     </hal>
-    <hal format="hidl">
-        <name>android.hardware.neuralnetworks</name>
-        <transport>hwbinder</transport>
-        <version>1.2</version>
-        <interface>
-            <name>IDevice</name>
-            <instance>armnn</instance>
-        </interface>
-        <fqname>@1.2::IDevice/armnn</fqname>
-    </hal>
     <hal format="hidl">
        <name>android.hardware.neuralnetworks</name>
        <transport>hwbinder</transport>

From db9ee009a8b12740d9ac557bbdd8d29e91227a75 Mon Sep 17 00:00:00 2001
From: Rios Kao <rioskao@google.com>
Date: Tue, 18 Jul 2023 07:41:06 +0000
Subject: [PATCH 2/2] aidl: sthal: add support for aec record in mixer table

note: This table is only used by AIDL Sthal.

Bug: 291186942
Test: end-to-end enable path by quick phrase.
Change-Id: I89cfef9a89e96530d866b73da963b2ec2ce7a55e
---
 audio/felix/aidl_config/mixer_paths_aidl.xml | 22 ++++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/audio/felix/aidl_config/mixer_paths_aidl.xml b/audio/felix/aidl_config/mixer_paths_aidl.xml
index 828cd8a..8821ce1 100644
--- a/audio/felix/aidl_config/mixer_paths_aidl.xml
+++ b/audio/felix/aidl_config/mixer_paths_aidl.xml
@@ -805,6 +805,17 @@
     <ctl name="MIC Record Soft Gain (dB)" value="0" />
   </path>
 
+  <path name="microphones (SOUND_TRIGGER_AEC)">
+    <ctl name="Audio Capture Eraser Enable" value="1" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
+    <ctl name="MIC DC Blocker" value="1" />
+    <ctl name="Audio Capture Mic Source" value="ERASER" />
+    <ctl name="MIC Record Soft Gain (dB)" value="0" />
+  </path>
+
   <path name="back-microphones">
     <ctl name="Mic Spatial Module Enable" value="1" />
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
@@ -848,17 +859,6 @@
     <ctl name="MIC Record Soft Gain (dB)" value="0" />
   </path>
 
-  <path name="voice-recog-aec-mic">
-    <ctl name="Audio Capture Eraser Enable" value="1" />
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3" />
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
-    <ctl name="MIC DC Blocker" value="1" />
-    <ctl name="Audio Capture Mic Source" value="ERASER" />
-    <ctl name="MIC Record Soft Gain (dB)" value="0" />
-  </path>
-
   <path name="unprocessed-mic">
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3" />