From 9b158db9f3eab807a642f2c2d52a020a0ec69b85 Mon Sep 17 00:00:00 2001
From: Renato Grottesi <otaner@google.com>
Date: Thu, 13 Jul 2023 18:49:28 +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: Ia1e2a76763e4d0b483513ee84ff124b404647107
---
 manifest.xml | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/manifest.xml b/manifest.xml
index 8ece978..a427ac0 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 cb039ba50208e943fdc9bd722ef6457073e3db84 Mon Sep 17 00:00:00 2001
From: Gaurav Sarode <sgaurav@google.com>
Date: Thu, 13 Jul 2023 17:12:26 -0700
Subject: [PATCH 2/2] Fix tangorpro_car build file path

bug: 291147977
Test: local build
Change-Id: I54c9e4d7523ce2d6f9faf50fdc126163e9547593
---
 tangorpro/BoardConfig.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tangorpro/BoardConfig.mk b/tangorpro/BoardConfig.mk
index 0aca763..a38dff3 100644
--- a/tangorpro/BoardConfig.mk
+++ b/tangorpro/BoardConfig.mk
@@ -23,7 +23,7 @@ BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true
 BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1
 
 ifdef PHONE_CAR_BOARD_PRODUCT
-    include vendor/auto/embedded/products/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk
+    include device/google_car/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk 
 else
     TARGET_SCREEN_DENSITY := 320
 endif