From 4f5da1bfa90f8f57fb8dff594f52686aa969f0ca 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
---
 BoardConfig-common.mk | 10 ----------
 device.mk             |  2 +-
 manifest.xml          | 10 ----------
 3 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index c5c186b..d2d094a 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -354,16 +354,6 @@ BOARD_VNDK_VERSION := current
 # H/W align restriction of MM IPs
 BOARD_EXYNOS_S10B_FORMAT_ALIGN := 64
 
-# NeuralNetworks
-GPU_SOURCE_PRESENT := $(wildcard vendor/arm/mali/valhall)
-GPU_PREBUILD_PRESENT := $(wildcard vendor/google_devices/zumapro/prebuilts/gpu)
-ifneq (,$(strip $(GPU_SOURCE_PRESENT) $(GPU_PREBUILD_PRESENT)))
-ARMNN_COMPUTE_CL_ENABLE := 1
-else
-ARMNN_COMPUTE_CL_ENABLE := 0
-endif
-ARMNN_COMPUTE_NEON_ENABLE := 1
-
 # Boot.img
 BOARD_RAMDISK_USE_LZ4     := true
 #BOARD_KERNEL_BASE        := 0x80000000
diff --git a/device.mk b/device.mk
index 0ffe65b..1755018 100644
--- a/device.mk
+++ b/device.mk
@@ -230,7 +230,7 @@ PRODUCT_SOONG_NAMESPACES += \
 $(call soong_config_set,pixel_mali,soc,$(TARGET_BOARD_PLATFORM))
 $(call soong_config_set,arm_gralloc,soc,$(TARGET_BOARD_PLATFORM))
 
-include device/google/gs101/neuralnetwork/neuralnetwork.mk
+include device/google/gs-common/gpu/gpu.mk
 
 PRODUCT_PACKAGES += \
 	csffw_image_prebuilt__firmware_prebuilt_ttux_mali_csffw.bin \
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>