From a15331d5744dd7b5ca9a9ee3d9f356aff067631e Mon Sep 17 00:00:00 2001
From: Android Culprit Assistant
 <boq-android-culprit-assistant@system.gserviceaccount.com>
Date: Wed, 12 Jul 2023 20:43:46 +0000
Subject: [PATCH] Revert "Remove settings for old ArmNN HIDL backend"

This revert was created by Android Culprit Assistant. The culprit was identified in the following culprit search session (http://go/aca-get/123b2665-83ef-4fd0-904d-a0d8c5782db9).

Change-Id: Ib69a94a6a2a8a087e3c2e7e5539045ec751e4a8f
---
 BoardConfig-common.mk | 10 ++++++++++
 device.mk             |  5 +++++
 manifest-gralloc3.xml | 10 ++++++++++
 manifest.xml          | 10 ++++++++++
 4 files changed, 35 insertions(+)

diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index 723b6b6e..f6804417 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -352,6 +352,16 @@ 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 b9dcf4cd..30e1ef9e 100644
--- a/device.mk
+++ b/device.mk
@@ -225,6 +225,8 @@ 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 \
@@ -998,6 +1000,9 @@ PRODUCT_COPY_FILES += \
 	device/google/$(TARGET_BOARD_PLATFORM)/radio/config/Pixel_stability.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/modem/Pixel_stability.cfg \
 	device/google/$(TARGET_BOARD_PLATFORM)/radio/config/Pixel_stability.nprf:$(TARGET_COPY_OUT_VENDOR)/etc/modem/Pixel_stability.nprf \
 
+# ARM NN files
+ARMNN_COMPUTE_CL_ENABLE := 1
+
 # Vibrator Diag
 PRODUCT_PACKAGES_DEBUG += \
 	diag-vibrator \
diff --git a/manifest-gralloc3.xml b/manifest-gralloc3.xml
index 0427aa5e..dc91529d 100644
--- a/manifest-gralloc3.xml
+++ b/manifest-gralloc3.xml
@@ -82,6 +82,16 @@
             <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 b6e6396b..90af32bd 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -13,6 +13,16 @@
         <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>