From 86e6a4bcc37411421dffc1f883f72dc47bb23c9d Mon Sep 17 00:00:00 2001
From: Renato Grottesi <otaner@google.com>
Date: Thu, 13 Jul 2023 08:40:59 +0000
Subject: [PATCH] Revert^2 "Remove settings for old ArmNN HIDL backend"

6ed8fba5c7b2307524c0535c66bd7b2ff4e06be1

Compile ArmNN shim over the support library.

Remove settings for the old HIDL backend.
The new ones 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
Change-Id: I51b44b4e11444661cf965265113a22522568b9b1
---
 BoardConfig-common.mk          | 10 ----------
 device.mk                      |  5 -----
 neuralnetwork/neuralnetwork.mk |  2 --
 3 files changed, 17 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 d62c3e19..4a18cc1f 100644
--- a/device.mk
+++ b/device.mk
@@ -199,8 +199,6 @@ 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 \
@@ -966,9 +964,6 @@ PRODUCT_COPY_FILES += \
 PRODUCT_COPY_FILES += \
 	device/google/gs101/radio/gnss_blanking.csv:$(TARGET_COPY_OUT_VENDOR)/etc/modem/gnss_blanking.csv
 
-# ARM NN files
-ARMNN_COMPUTE_CL_ENABLE := 1
-
 # Vibrator Diag
 PRODUCT_PACKAGES_DEBUG += \
 	diag-vibrator \
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/