From c0baa17abe8b71fa1f9cf2a8add066c6911c8d28 Mon Sep 17 00:00:00 2001
From: Renato Grottesi <otaner@google.com>
Date: Thu, 13 Jul 2023 18:47:23 +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
Merged-In: I3652eceb14d06a3e909444edc21ad86d9378bc6c
Change-Id: If26928b13cdd9f3342026af95b9446f2918784fa
---
 BoardConfig-common.mk | 10 ----------
 device.mk             |  2 +-
 manifest-gralloc3.xml | 10 ----------
 manifest.xml          | 10 ----------
 4 files changed, 1 insertion(+), 31 deletions(-)

diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index f6804417..723b6b6e 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -352,16 +352,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/zebu/prebuilts/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 77522814..68fc2bc2 100644
--- a/device.mk
+++ b/device.mk
@@ -225,7 +225,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 += \
 	csffw_image_prebuilt__firmware_prebuilt_todx_mali_csffw.bin \
diff --git a/manifest-gralloc3.xml b/manifest-gralloc3.xml
index dc91529d..0427aa5e 100644
--- a/manifest-gralloc3.xml
+++ b/manifest-gralloc3.xml
@@ -82,16 +82,6 @@
             <instance>default</instance>
         </interface>
     </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/manifest.xml b/manifest.xml
index 90af32bd..b6e6396b 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>

From c011b953fff28ba44505658cad0c4a233b865533 Mon Sep 17 00:00:00 2001
From: Ilya Matyukhin <ilyamaty@google.com>
Date: Thu, 6 Jul 2023 20:27:44 +0000
Subject: [PATCH 2/2] Bump IDebugManager version to 4

Bug: 278914238
Test: build
Change-Id: I82bc2459776961a8a4d921aaecfa081dcbda6a00
---
 device_framework_matrix_product.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml
index 4cb1e419..80523352 100644
--- a/device_framework_matrix_product.xml
+++ b/device_framework_matrix_product.xml
@@ -82,7 +82,7 @@
     </hal>
     <hal format="aidl" optional="true">
       <name>com.google.face.debug</name>
-      <version>3</version>
+      <version>4</version>
         <interface>
             <name>IDebugHost</name>
             <instance>default</instance>