From 185f37252989d6aaaed5083f32ce9960e8f28fa2 Mon Sep 17 00:00:00 2001
From: Renato Grottesi <otaner@google.com>
Date: Thu, 13 Jul 2023 18:45:46 +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: Local run of CtsNNAPITestCases
Test: Local run of VtsHalNeuralnetworksTargetTest
Test: Local run of MLTS Benchmark
Bug: 283724775
Merged-In: I51b44b4e11444661cf965265113a22522568b9b1
Change-Id: I58316837c0ed87ce595be30657fd856969478809
---
 BoardConfig-common.mk          | 10 ----------
 device.mk                      |  2 +-
 manifest.xml                   | 10 ----------
 manifest_64.xml                | 10 ----------
 neuralnetwork/neuralnetwork.mk |  2 --
 5 files changed, 1 insertion(+), 33 deletions(-)
 delete mode 100644 neuralnetwork/neuralnetwork.mk

diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index 7883c20c..70e9d648 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -321,16 +321,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/gs101/prebuilts/gpu/libs)
-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 fff92d14..dadd0a12 100644
--- a/device.mk
+++ b/device.mk
@@ -199,7 +199,7 @@ PRODUCT_SOONG_NAMESPACES += \
 
 $(call soong_config_set,pixel_mali,soc,$(TARGET_BOARD_PLATFORM))
 
-include device/google/gs101/neuralnetwork/neuralnetwork.mk
+include device/google/gs-common/gpu/gpu.mk
 
 PRODUCT_PACKAGES += \
 	libGLES_mali \
diff --git a/manifest.xml b/manifest.xml
index 20ee97b5..19775bc8 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -35,16 +35,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>
diff --git a/manifest_64.xml b/manifest_64.xml
index ed6b03b4..b409b72f 100644
--- a/manifest_64.xml
+++ b/manifest_64.xml
@@ -22,16 +22,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="hidl">
        <name>android.hardware.neuralnetworks</name>
        <transport>hwbinder</transport>
diff --git a/neuralnetwork/neuralnetwork.mk b/neuralnetwork/neuralnetwork.mk
deleted file mode 100644
index 1533d2a6..00000000
--- a/neuralnetwork/neuralnetwork.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-PRODUCT_PACKAGES += android.hardware.neuralnetworks@1.3-service-armnn
-BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs101-sepolicy/neuralnetworks/