From 4436d921be618db00e46f045c99296691b5011f4 Mon Sep 17 00:00:00 2001
From: Robin Peng <robinpeng@google.com>
Date: Mon, 24 Jul 2023 07:19:58 +0000
Subject: [PATCH] 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: build pass
Bug: 283724775
Bug: 292364331
Bug: 292443970
Change-Id: If7147eba78fbab93ea5c772582570caf0b868225
---
 device.mk    |  1 +
 manifest.xml | 10 ----------
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/device.mk b/device.mk
index 4e5982a..5291e85 100644
--- a/device.mk
+++ b/device.mk
@@ -231,6 +231,7 @@ $(call soong_config_set,pixel_mali,soc,$(TARGET_BOARD_PLATFORM))
 $(call soong_config_set,arm_gralloc,soc,$(TARGET_BOARD_PLATFORM))
 
 include device/google/gs-common/gpu/gpu.mk
+
 PRODUCT_PACKAGES += \
 	csffw_image_prebuilt__firmware_prebuilt_ttux_mali_csffw.bin \
 	libGLES_mali \
diff --git a/manifest.xml b/manifest.xml
index 6cd9fa5..e129014 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -13,16 +13,6 @@
         <transport>hwbinder</transport>
         <fqname>@1.2::IBootControl/default</fqname>
     </hal>
-    <hal format="hidl">
-        <name>android.hardware.neuralnetworks</name>
-        <transport>hwbinder</transport>
-        <version>1.3</version>
-        <interface>
-            <name>IDevice</name>
-            <instance>google-armnn</instance>
-        </interface>
-        <fqname>@1.3::IDevice/google-armnn</fqname>
-    </hal>
     <hal format="aidl">
         <name>com.google.input.algos.spd</name>
         <interface>